diff options
| author |   hayeswang <hayeswang@realtek.com> | 2014-09-30 16:48:01 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-30 16:23:51 -0400 |
| commit | f561de33d63aefb97fb0c3653a36fb32d4e8c74a (patch) | |
| tree | 84af0838d17e75137ca62f5981a18003a885eb31 /drivers/net/usb | |
| parent | Merge branch 'netxen' (diff) | |
| download | linux-dev-f561de33d63aefb97fb0c3653a36fb32d4e8c74a.tar.xz linux-dev-f561de33d63aefb97fb0c3653a36fb32d4e8c74a.zip | |
r8152: fix setting RTL8152_UNPLUG
The flag of RTL8152_UNPLUG should only be set when the device is
unplugged, not each time the rtl8152_disconnect() is called.
Otherwise, the device wouldn't be stopped normally.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index e0394427e372..f68a4e6f45be 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3576,7 +3576,11 @@ static void rtl8152_disconnect(struct usb_interface *intf) usb_set_intfdata(intf, NULL); if (tp) { - set_bit(RTL8152_UNPLUG, &tp->flags); + struct usb_device *udev = tp->udev; + + if (udev->state == USB_STATE_NOTATTACHED) + set_bit(RTL8152_UNPLUG, &tp->flags); + tasklet_kill(&tp->tl); unregister_netdev(tp->netdev); tp->rtl_ops.unload(tp); |