Commit d866afcb authored by Marc Pignat's avatar Marc Pignat Committed by Greg Kroah-Hartman

zd1211rw, fix oops when ejecting install media

patch e0579d57 in mainline.

The disconnect function can dereference the net_device structure when it
is never allocated. This is the case when ejecting the device installer.
Signed-off-by: default avatarMarc Pignat <marc.pignat@hevs.ch>
Acked-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 90218467
...@@ -1041,14 +1041,17 @@ error: ...@@ -1041,14 +1041,17 @@ error:
static void disconnect(struct usb_interface *intf) static void disconnect(struct usb_interface *intf)
{ {
struct net_device *netdev = zd_intf_to_netdev(intf); struct net_device *netdev = zd_intf_to_netdev(intf);
struct zd_mac *mac = zd_netdev_mac(netdev); struct zd_mac *mac;
struct zd_usb *usb = &mac->chip.usb; struct zd_usb *usb;
/* Either something really bad happened, or we're just dealing with /* Either something really bad happened, or we're just dealing with
* a DEVICE_INSTALLER. */ * a DEVICE_INSTALLER. */
if (netdev == NULL) if (netdev == NULL)
return; return;
mac = zd_netdev_mac(netdev);
usb = &mac->chip.usb;
dev_dbg_f(zd_usb_dev(usb), "\n"); dev_dbg_f(zd_usb_dev(usb), "\n");
zd_netdev_disconnect(netdev); zd_netdev_disconnect(netdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment