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.

From http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=f561de33d63aefb97fb0c3653a36fb32d4e8c74a

Change-Id: I7dbc931baa65efa46d572ebd7b93209e6fe01751
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from upstream commit f561de33d63aefb97fb0c3653a36fb32d4e8c74a)
Signed-off-by: Aly Hirani <ahirani@nvidia.com>
Reviewed-on: http://git-master/r/553398
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/usb/r8152_shield.c b/drivers/net/usb/r8152_shield.c
index 8f122d4b0..6a0aad588 100644
--- a/drivers/net/usb/r8152_shield.c
+++ b/drivers/net/usb/r8152_shield.c
@@ -3757,7 +3757,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);