git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
intel
/
iwlwifi
/
pcie
/
trans.c
diff --git
a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index b55fa9efa1e34e23ee908267ae977340ef1c0876..803fcbac415255d39e995a299e3ed031988e7436 100644
(file)
--- a/
drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/
drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@
-2069,7
+2069,6
@@
static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans,
* MAC_ACCESS_REQ bit to be performed before any other writes
* scheduled on different CPUs (after we drop reg_lock).
*/
- mmiowb();
out:
spin_unlock_irqrestore(&trans_pcie->reg_lock, *flags);
}