diff options
| author | Greg Kroah-Hartman | 2018-07-16 09:06:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-07-16 09:06:57 +0200 |
| commit | 956f004a044007ea3b8fb19a525535933bb4f2a4 (patch) | |
| tree | a8dbe5a16d8786083bd1e3393c36133b74c30691 /drivers/staging/rtlwifi/rtl8822be | |
| parent | staging: gasket: remove gasket_wait_sync() (diff) | |
| parent | Linux 4.18-rc5 (diff) | |
| download | kernel-qcow2-linux-956f004a044007ea3b8fb19a525535933bb4f2a4.tar.gz kernel-qcow2-linux-956f004a044007ea3b8fb19a525535933bb4f2a4.tar.xz kernel-qcow2-linux-956f004a044007ea3b8fb19a525535933bb4f2a4.zip | |
Merge 4.18-rc5 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtlwifi/rtl8822be')
| -rw-r--r-- | drivers/staging/rtlwifi/rtl8822be/hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtlwifi/rtl8822be/hw.c b/drivers/staging/rtlwifi/rtl8822be/hw.c index 7947edb239a1..88ba5b2fea6a 100644 --- a/drivers/staging/rtlwifi/rtl8822be/hw.c +++ b/drivers/staging/rtlwifi/rtl8822be/hw.c @@ -803,7 +803,7 @@ static void _rtl8822be_enable_aspm_back_door(struct ieee80211_hw *hw) return; pci_read_config_byte(rtlpci->pdev, 0x70f, &tmp); - pci_write_config_byte(rtlpci->pdev, 0x70f, tmp | BIT(7)); + pci_write_config_byte(rtlpci->pdev, 0x70f, tmp | ASPM_L1_LATENCY << 3); pci_read_config_byte(rtlpci->pdev, 0x719, &tmp); pci_write_config_byte(rtlpci->pdev, 0x719, tmp | BIT(3) | BIT(4)); |