diff options
author | hayeswang <hayeswang@realtek.com> | 2017-01-23 14:18:43 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-24 13:38:47 -0500 |
commit | 6a0b76c04ec157c88ca943debf78a8ee58469f2d (patch) | |
tree | a2d0dd46864b6adf1a93490d9e46ccad1dfcc7eb | |
parent | 7630ea4bda18df2ee1c64dfdca1724a9cc32f920 (diff) | |
download | linux-stable-6a0b76c04ec157c88ca943debf78a8ee58469f2d.tar.gz linux-stable-6a0b76c04ec157c88ca943debf78a8ee58469f2d.tar.bz2 linux-stable-6a0b76c04ec157c88ca943debf78a8ee58469f2d.zip |
r8152: don't execute runtime suspend if the tx is not empty
Runtime suspend shouldn't be executed if the tx queue is not empty,
because the device is not idle.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/usb/r8152.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 0e99af090734..e1466b4d2b6c 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -32,7 +32,7 @@ #define NETNEXT_VERSION "08" /* Information for net */ -#define NET_VERSION "6" +#define NET_VERSION "7" #define DRIVER_VERSION "v1." NETNEXT_VERSION "." NET_VERSION #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>" @@ -3574,6 +3574,8 @@ static bool delay_autosuspend(struct r8152 *tp) */ if (!sw_linking && tp->rtl_ops.in_nway(tp)) return true; + else if (!skb_queue_empty(&tp->tx_queue)) + return true; else return false; } |