* [PATCH net] r8152: fix setting RTL8152_UNPLUG
@ 2014-09-30 8:48 Hayes Wang
2014-09-30 20:24 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Hayes Wang @ 2014-09-30 8:48 UTC (permalink / raw)
To: netdev; +Cc: nic_swsd, linux-kernel, linux-usb, Hayes Wang
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>
---
drivers/net/usb/r8152.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index e039442..f68a4e6 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);
--
1.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] r8152: fix setting RTL8152_UNPLUG
2014-09-30 8:48 [PATCH net] r8152: fix setting RTL8152_UNPLUG Hayes Wang
@ 2014-09-30 20:24 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-09-30 20:24 UTC (permalink / raw)
To: hayeswang; +Cc: netdev, nic_swsd, linux-kernel, linux-usb
From: Hayes Wang <hayeswang@realtek.com>
Date: Tue, 30 Sep 2014 16:48:01 +0800
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-30 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-30 8:48 [PATCH net] r8152: fix setting RTL8152_UNPLUG Hayes Wang
2014-09-30 20:24 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).