summaryrefslogtreecommitdiff
path: root/drivers/net/usb/usbnet.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-06-07 23:23:03 +0300
committerDavid S. Miller <davem@davemloft.net>2021-06-07 23:23:03 +0300
commit8c3f3362cded07f58fbb0d8e27f3d1b61ca92c6e (patch)
tree63e8ff315e0f029ab7ffdeb408a53e9322526342 /drivers/net/usb/usbnet.c
parentef91f7981036a293ee1fa1cd2f670702a3889f4b (diff)
parent2c9d6c2b871d5841ce26ede3e81fd37e2e33c42c (diff)
downloadlinux-8c3f3362cded07f58fbb0d8e27f3d1b61ca92c6e.tar.xz
Merge branch 'ax88772-phylib'
Oleksij Rempel says: ==================== port asix ax88772 to the PHYlib changes v2: - add Reviewed-by: Andrew Lunn <andrew@lunn.ch> to some patches - refactor asix_read_phy_addr() and add error handling for all callers - refactor asix_mdio_bus_read() Port ax88772 part of asix driver to the phylib to be able to use more advanced external PHY attached to this controller. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/usbnet.c')
-rw-r--r--drivers/net/usb/usbnet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index ecf62849f4c1..57a5a025255c 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1597,6 +1597,9 @@ void usbnet_disconnect (struct usb_interface *intf)
xdev->bus->bus_name, xdev->devpath,
dev->driver_info->description);
+ if (dev->driver_info->unbind)
+ dev->driver_info->unbind(dev, intf);
+
net = dev->net;
unregister_netdev (net);
@@ -1604,9 +1607,6 @@ void usbnet_disconnect (struct usb_interface *intf)
usb_scuttle_anchored_urbs(&dev->deferred);
- if (dev->driver_info->unbind)
- dev->driver_info->unbind (dev, intf);
-
usb_kill_urb(dev->interrupt);
usb_free_urb(dev->interrupt);
kfree(dev->padding_pkt);