summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2018-03-07 10:46:58 +0100
committerDavid S. Miller <davem@davemloft.net>2018-03-07 21:39:27 +0100
commitbb5441fc3cc0e11be0ff9bbc6a00a74b3d2b0153 (patch)
tree216b79e7788c424deea97b4cef27c62c7471ac5e
parentnet: kalmia: clean up bind error path (diff)
downloadlinux-bb5441fc3cc0e11be0ff9bbc6a00a74b3d2b0153.tar.xz
linux-bb5441fc3cc0e11be0ff9bbc6a00a74b3d2b0153.zip
net: cdc_eem: 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> Acked-by: Oliver Neukum <oneukum@suse.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/cdc_eem.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index f7180f8db39e..61ea4eaace5d 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -83,11 +83,8 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf)
int status = 0;
status = usbnet_get_endpoints(dev, intf);
- if (status < 0) {
- usb_set_intfdata(intf, NULL);
- usb_driver_release_interface(driver_of(intf), intf);
+ if (status < 0)
return status;
- }
/* no jumbogram (16K) support for now */