Explorar o código

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>
hayeswang %!s(int64=11) %!d(string=hai) anos
pai
achega
f561de33d6
Modificáronse 1 ficheiros con 5 adicións e 1 borrados
  1. 5 1
      drivers/net/usb/r8152.c

+ 5 - 1
drivers/net/usb/r8152.c

@@ -3576,7 +3576,11 @@ static void rtl8152_disconnect(struct usb_interface *intf)
 
 
 	usb_set_intfdata(intf, NULL);
 	usb_set_intfdata(intf, NULL);
 	if (tp) {
 	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);
 		tasklet_kill(&tp->tl);
 		unregister_netdev(tp->netdev);
 		unregister_netdev(tp->netdev);
 		tp->rtl_ops.unload(tp);
 		tp->rtl_ops.unload(tp);