aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/usb/kalmia.c
diff options
context:
space:
mode:
authorJohan Hovold2018-03-07 10:46:57 +0100
committerDavid S. Miller2018-03-07 15:39:27 -0500
commit4f06717fb063ad4ef38bd5e0ec1881bc784c325b (patch)
treebe440fa041cdf9280b72ad43e43198fd4850758f /drivers/net/usb/kalmia.c
parentbcde6b725f156a828d129a64d82730b21de9d44f (diff)
net: kalmia: clean up bind error path
Drop bogus call to usb_driver_release_interface() from an error path in the usbnet bind() callback, which is called during interface probe. At this point the interface is not bound and usb_driver_release_interface() returns early. Also remove the bogus call to clear the interface data, which is owned by the usbnet driver and would not even have been set by the time bind() is called. Signed-off-by: Johan Hovold <johan@kernel.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/kalmia.c')
-rw-r--r--drivers/net/usb/kalmia.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
index 1ec523b0e932..bd2ba3659028 100644
--- a/drivers/net/usb/kalmia.c
+++ b/drivers/net/usb/kalmia.c
@@ -150,12 +150,8 @@ kalmia_bind(struct usbnet *dev, struct usb_interface *intf)
dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing
status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr);
-
- if (status) {
- usb_set_intfdata(intf, NULL);
- usb_driver_release_interface(driver_of(intf), intf);
+ if (status)
return status;
- }
memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN);