diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:08:51 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:08:51 -0400 |
| commit | b9a3acf46afdafc601947136f63e9dd228cd86e8 (patch) | |
| tree | 2b206b6d3c51f673c94fbcdf03df2a699e7110d2 /drivers/net/usb/rtl8150.c | |
| parent | 9f0fa7991af382bfa8c9575d2457a0b6ad03ac4c (diff) | |
| parent | 21d41f2b312231536cf981c960c83cc4493c0293 (diff) | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'drivers/net/usb/rtl8150.c')
| -rw-r--r-- | drivers/net/usb/rtl8150.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index 041fb7d43c4f..ef3b236b5145 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c | |||
| @@ -977,7 +977,6 @@ static void rtl8150_disconnect(struct usb_interface *intf) | |||
| 977 | usb_set_intfdata(intf, NULL); | 977 | usb_set_intfdata(intf, NULL); |
| 978 | if (dev) { | 978 | if (dev) { |
| 979 | set_bit(RTL8150_UNPLUG, &dev->flags); | 979 | set_bit(RTL8150_UNPLUG, &dev->flags); |
| 980 | tasklet_disable(&dev->tl); | ||
| 981 | tasklet_kill(&dev->tl); | 980 | tasklet_kill(&dev->tl); |
| 982 | unregister_netdev(dev->netdev); | 981 | unregister_netdev(dev->netdev); |
| 983 | unlink_all_urbs(dev); | 982 | unlink_all_urbs(dev); |