net: kalmia: clean up bind error path
authorJohan Hovold <johan@kernel.org>
Wed, 7 Mar 2018 09:46:57 +0000 (10:46 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Mar 2018 20:39:27 +0000 (15:39 -0500)
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>
drivers/net/usb/kalmia.c

index 1ec523b0e9324cbc648ac85bd542111bdff5b880..bd2ba365902883f1b4d66c8d83650d81f1813652 100644 (file)
@@ -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);