From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 15 Mar 2020 13:52:23 +0000 (+0100)
Subject: fix up queue-4.9/r8152-check-disconnect-status-after-long-sleep.patch
X-Git-Tag: v4.19.110~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=137c82eddac157dcad831ede2125e56f89d08bad;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-4.9/r8152-check-disconnect-status-after-long-sleep.patch
---

diff --git a/queue-4.9/r8152-check-disconnect-status-after-long-sleep.patch b/queue-4.9/r8152-check-disconnect-status-after-long-sleep.patch
index dcded9f489f..3ee73ebb0ea 100644
--- a/queue-4.9/r8152-check-disconnect-status-after-long-sleep.patch
+++ b/queue-4.9/r8152-check-disconnect-status-after-long-sleep.patch
@@ -86,21 +86,12 @@ Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/net/usb/r8152.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
+ drivers/net/usb/r8152.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
 
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -2789,6 +2789,8 @@ static void r8153_aldps_en(struct r8152
- 		data &= ~EN_ALDPS;
- 		ocp_reg_write(tp, OCP_POWER_CFG, data);
- 		msleep(20);
-+		if (test_bit(RTL8152_UNPLUG, &tp->flags))
-+			break;
- 	}
- }
- 
-@@ -3423,7 +3425,10 @@ static void r8153_init(struct r8152 *tp)
+@@ -3423,7 +3423,10 @@ static void r8153_init(struct r8152 *tp)
  		if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) &
  		    AUTOLOAD_DONE)
  			break;
@@ -111,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	}
  
  	for (i = 0; i < 500; i++) {
-@@ -3447,7 +3452,10 @@ static void r8153_init(struct r8152 *tp)
+@@ -3447,7 +3450,10 @@ static void r8153_init(struct r8152 *tp)
  		ocp_data = ocp_reg_read(tp, OCP_PHY_STATUS) & PHY_STAT_MASK;
  		if (ocp_data == PHY_STAT_LAN_ON)
  			break;