aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2017-01-23 01:18:43 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-24 13:38:47 -0500
commit6a0b76c04ec157c88ca943debf78a8ee58469f2d (patch)
treea2d0dd46864b6adf1a93490d9e46ccad1dfcc7eb
parent7630ea4bda18df2ee1c64dfdca1724a9cc32f920 (diff)
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.c4
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 @@
32#define NETNEXT_VERSION "08" 32#define NETNEXT_VERSION "08"
33 33
34/* Information for net */ 34/* Information for net */
35#define NET_VERSION "6" 35#define NET_VERSION "7"
36 36
37#define DRIVER_VERSION "v1." NETNEXT_VERSION "." NET_VERSION 37#define DRIVER_VERSION "v1." NETNEXT_VERSION "." NET_VERSION
38#define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>" 38#define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
@@ -3574,6 +3574,8 @@ static bool delay_autosuspend(struct r8152 *tp)
3574 */ 3574 */
3575 if (!sw_linking && tp->rtl_ops.in_nway(tp)) 3575 if (!sw_linking && tp->rtl_ops.in_nway(tp))
3576 return true; 3576 return true;
3577 else if (!skb_queue_empty(&tp->tx_queue))
3578 return true;
3577 else 3579 else
3578 return false; 3580 return false;
3579} 3581}