浏览代码

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>
hayeswang 8 年之前
父节点
当前提交
6a0b76c04e
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/net/usb/r8152.c

+ 3 - 1
drivers/net/usb/r8152.c

@@ -32,7 +32,7 @@
 #define NETNEXT_VERSION		"08"
 #define NETNEXT_VERSION		"08"
 
 
 /* Information for net */
 /* Information for net */
-#define NET_VERSION		"6"
+#define NET_VERSION		"7"
 
 
 #define DRIVER_VERSION		"v1." NETNEXT_VERSION "." NET_VERSION
 #define DRIVER_VERSION		"v1." NETNEXT_VERSION "." NET_VERSION
 #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
 #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))
 	if (!sw_linking && tp->rtl_ops.in_nway(tp))
 		return true;
 		return true;
+	else if (!skb_queue_empty(&tp->tx_queue))
+		return true;
 	else
 	else
 		return false;
 		return false;
 }
 }