[PATCH 1/9][G/H/U/OEM-5.10] Revert "UBUNTU: SAUCE: e1000e: bump up timeout to wait when ME un-configure ULP mode"

[Aaron Ma]

BugLink: https://bugs.launchpad.net/bugs/1910541

This reverts commit b97a9ad57d72cd17b36f7bf819b532e2a1a4be5e.

Revert the sauce patch to use upstream patch instead.

Signed-off-by: Aaron Ma <aaron.ma at canonical.com>
---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index b094c069aee1..682f6a7bd5c1 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -1248,9 +1248,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
 			ew32(H2ME, mac_reg);
 		}
 
-		/* Poll up to 2.5sec for ME to clear ULP_CFG_DONE. */
+		/* Poll up to 300msec for ME to clear ULP_CFG_DONE. */
 		while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) {
-			if (i++ == 250) {
+			if (i++ == 30) {
 				ret_val = -E1000_ERR_PHY;
 				goto out;
 			}
-- 
2.28.0