# HG changeset patch # User Edouard Tisserant # Date 1539069773 -7200 # Node ID 32c9a2dea9ed7e30e0ab6b0dbf1e58a706b6c0ea # Parent ca80d6dac4c84a62cb526a56f28c8b9ec8d0e2e9 devices/rtdmnet.c : fixed indentation and error handling. diff -r ca80d6dac4c8 -r 32c9a2dea9ed devices/rtdmnet.c --- a/devices/rtdmnet.c Mon Oct 08 23:16:34 2018 +0200 +++ b/devices/rtdmnet.c Tue Oct 09 09:22:53 2018 +0200 @@ -243,10 +243,10 @@ from cobalt thread (i.e. if (cobalt_ppd_get(0) != &cobalt_kernel_ppd)) we resolve it here in advance */ dev->rtdm_fd = rtdm_fd_get(dev->socket,0); - if (IS_ERR(dev->rtdm_fd)){ + if (IS_ERR(dev->rtdm_fd)){ printk(" rtdm_fd_get() = %d!\n", ret); - ret = PTR_ERR(dev->rtdm_fd); - goto out_err; + ret = PTR_ERR(dev->rtdm_fd); + goto out_err_rtdm_fd; } printk(KERN_ERR PFX "Binding socket to interface %i (%s).\n", @@ -260,13 +260,14 @@ sizeof(struct sockaddr_ll)); if (ret < 0) { printk(" rtdm_bind() = %d!\n", ret); - goto out_err; + goto out_err_bind; } return 0; -out_err: +out_err_bind: rtdm_fd_put(dev->rtdm_fd); +out_err_rtdm_fd: rtdm_close(dev->socket); dev->socket = -1; return ret; @@ -375,10 +376,10 @@ msg.msg_iov = &iov; msg.msg_iovlen = 1; - if (rtdm_in_rt_context()) + if (rtdm_in_rt_context()) /* HACK : call fd ops directly as in rtdm's fd.c */ ret = dev->rtdm_fd->ops->sendmsg_rt(dev->rtdm_fd, &msg, 0); - else + else ret = nrt_rtdm_sendmsg(dev->socket, &msg); return ret == len ? NETDEV_TX_OK : NETDEV_TX_BUSY;