summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-io.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-11-28 19:21:10 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-28 19:21:10 -0500
commit8317e2047ef7d70dd76bf1d571fecaa8d4deb06f (patch)
treec400a600a4eb00da224b4e59e76396655e853d07 /drivers/net/wireless/iwlwifi/iwl-io.c
parent2c55a3d08ade44a778c182c220a7907ec65d5fb8 (diff)
parent39338b56382ac640614851a80e0bd71994cc664d (diff)
downloadlinux-8317e2047ef7d70dd76bf1d571fecaa8d4deb06f.tar.bz2
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-io.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 3ffa8e62b856..3464cad7e38c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -143,7 +143,7 @@ u32 iwl_read_direct32(struct iwl_bus *bus, u32 reg)
spin_lock_irqsave(&bus->reg_lock, flags);
iwl_grab_nic_access(bus);
- value = iwl_read32(bus(bus), reg);
+ value = iwl_read32(bus, reg);
iwl_release_nic_access(bus);
spin_unlock_irqrestore(&bus->reg_lock, flags);