summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/r8152.c
diff options
context:
space:
mode:
authorhayeswang2015-02-06 04:30:48 +0100
committerDavid S. Miller2015-02-08 07:46:25 +0100
commit53543db5d5e3e147c5e03cecb1495d7d50ca43e2 (patch)
tree161fc6af909df5dbf6b138a0ef94fedd77c39bc4 /drivers/net/usb/r8152.c
parentr8152: check linking status with netif_carrier_ok (diff)
downloadkernel-qcow2-linux-53543db5d5e3e147c5e03cecb1495d7d50ca43e2.tar.gz
kernel-qcow2-linux-53543db5d5e3e147c5e03cecb1495d7d50ca43e2.tar.xz
kernel-qcow2-linux-53543db5d5e3e147c5e03cecb1495d7d50ca43e2.zip
r8152: check RTL8152_UNPLUG for rtl8152_close
It is unnecessary to accress the hw register if the device is unplugged. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/r8152.c')
-rw-r--r--drivers/net/usb/r8152.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 66678093db10..aade7b545f02 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3046,7 +3046,7 @@ static int rtl8152_close(struct net_device *netdev)
netif_stop_queue(netdev);
res = usb_autopm_get_interface(tp->intf);
- if (res < 0) {
+ if (res < 0 || test_bit(RTL8152_UNPLUG, &tp->flags)) {
rtl_drop_queued_tx(tp);
rtl_stop_rx(tp);
} else {