mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
wireless-drivers fixes for v5.12
Second set of fixes for v5.12. Only three iwlwifi fixes this time, the crash with MVM being the most important one and reported by multiple people. iwlwifi * fix kernel crash regression when using LTO with MVM devices * fix printk format warnings * fix potential deadlock found by lockdep -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJgP8G0AAoJEG4XJFUm622b1ZoH/1wSyEwQB90iYlZO4w1pR2yD HHHJjQQE8JCkOOoMNTHLkCfFWc76c/e6BL3+U9DsbvJGuPccUAIiiUQUonrEMph/ QmNBDd7OB/yIYpmkIpciKpaKAg2Vg4qF2owq8xRDpnD5NosTfCUiacvkuMRB4Wzl NuGBEECNw6Dq/l/vYVe2pgTQ+rYxCGrvpU7GsYAa5vOsSxzS+4RhMc4gFV5Ae9rK RNWT4StB7wi8sLjhdEYR2hldyS2OSPnrFNhfJggHw6d/4aXPlmBe7tnd3D1P3kwF +9FlqjA5U5bcT+3DC2ucFlGtwrfumxi+ro5j8Va19O2/eTLturCIK26A2C+BtTQ= =cOCt -----END PGP SIGNATURE----- Merge tag 'wireless-drivers-2021-03-03' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers Kalle Valo says: ==================== wireless-drivers fixes for v5.12 Second set of fixes for v5.12. Only three iwlwifi fixes this time, the crash with MVM being the most important one and reported by multiple people. iwlwifi * fix kernel crash regression when using LTO with MVM devices * fix printk format warnings * fix potential deadlock found by lockdep ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
ef9a6df09c
@ -271,12 +271,12 @@ static int iwl_pnvm_get_from_efi(struct iwl_trans *trans,
|
||||
err = efivar_entry_get(pnvm_efivar, NULL, &package_size, package);
|
||||
if (err) {
|
||||
IWL_DEBUG_FW(trans,
|
||||
"PNVM UEFI variable not found %d (len %zd)\n",
|
||||
"PNVM UEFI variable not found %d (len %lu)\n",
|
||||
err, package_size);
|
||||
goto out;
|
||||
}
|
||||
|
||||
IWL_DEBUG_FW(trans, "Read PNVM fro UEFI with size %zd\n", package_size);
|
||||
IWL_DEBUG_FW(trans, "Read PNVM fro UEFI with size %lu\n", package_size);
|
||||
|
||||
*data = kmemdup(package->data, *len, GFP_KERNEL);
|
||||
if (!*data)
|
||||
|
@ -1083,6 +1083,7 @@ static const struct dmi_system_id dmi_ppag_approved_list[] = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek COMPUTER INC."),
|
||||
},
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static int iwl_mvm_ppag_init(struct iwl_mvm *mvm)
|
||||
|
@ -1129,6 +1129,8 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans)
|
||||
|
||||
iwl_pcie_rx_init_rxb_lists(rxq);
|
||||
|
||||
spin_unlock_bh(&rxq->lock);
|
||||
|
||||
if (!rxq->napi.poll) {
|
||||
int (*poll)(struct napi_struct *, int) = iwl_pcie_napi_poll;
|
||||
|
||||
@ -1149,7 +1151,6 @@ static int _iwl_pcie_rx_init(struct iwl_trans *trans)
|
||||
napi_enable(&rxq->napi);
|
||||
}
|
||||
|
||||
spin_unlock_bh(&rxq->lock);
|
||||
}
|
||||
|
||||
/* move the pool to the default queue and allocator ownerships */
|
||||
|
Loading…
Reference in New Issue
Block a user