diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
| commit | 7b32641801900ee7e32065b436d7318c5d7a972e (patch) | |
| tree | 7e1f1ffca46787c5ba55af0a2fc9767f9c6e5594 /0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | |
| parent | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (diff) | |
| parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
| download | kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.gz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.xz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.zip | |
merge originkernel-5.8.0-0.rc3.1.vanilla.1.fc33kernel-5.8.0-0.rc3.1.vanilla.1.fc32kernel-5.8.0-0.rc3.1.vanilla.1.fc31
Diffstat (limited to '0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch')
| -rw-r--r-- | 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch index 40b387821..2ada4c644 100644 --- a/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch +++ b/0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch @@ -21,7 +21,7 @@ index f999cca37a8a..9cbd2d6c7da4 100644 @@ -1247,9 +1247,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) ew32(H2ME, mac_reg); } - + - /* Poll up to 300msec for ME to clear ULP_CFG_DONE. */ + /* Poll up to 2.5sec for ME to clear ULP_CFG_DONE. */ while (er32(FWSM) & E1000_FWSM_ULP_CFG_DONE) { @@ -31,5 +31,5 @@ index f999cca37a8a..9cbd2d6c7da4 100644 goto out; } -- -2.26.2 +2.25.4 |