diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-10 16:21:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-10 16:21:55 -0500 |
| commit | 821781a9f40673c2aa0f29d9d8226ec320dff20c (patch) | |
| tree | c9d5cb8a184fff84a9d841d8cb5da4b26be5c551 /drivers/net/can | |
| parent | 3174fed9820edc95cff74ad0934c3240c7fb5115 (diff) | |
| parent | 045169816b31b10faed984b01c390db1b32ee4c1 (diff) | |
| download | linux-821781a9f40673c2aa0f29d9d8226ec320dff20c.tar.gz linux-821781a9f40673c2aa0f29d9d8226ec320dff20c.tar.bz2 linux-821781a9f40673c2aa0f29d9d8226ec320dff20c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c index f3141ca56bc3..0b0302af3bd2 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c @@ -870,23 +870,25 @@ lbl_free_candev: static void peak_usb_disconnect(struct usb_interface *intf) { struct peak_usb_device *dev; + struct peak_usb_device *dev_prev_siblings; /* unregister as many netdev devices as siblings */ - for (dev = usb_get_intfdata(intf); dev; dev = dev->prev_siblings) { + for (dev = usb_get_intfdata(intf); dev; dev = dev_prev_siblings) { struct net_device *netdev = dev->netdev; char name[IFNAMSIZ]; + dev_prev_siblings = dev->prev_siblings; dev->state &= ~PCAN_USB_STATE_CONNECTED; strncpy(name, netdev->name, IFNAMSIZ); unregister_netdev(netdev); - free_candev(netdev); kfree(dev->cmd_buf); dev->next_siblings = NULL; if (dev->adapter->dev_free) dev->adapter->dev_free(dev); + free_candev(netdev); dev_info(&intf->dev, "%s removed\n", name); } |