diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-24 15:22:57 +0200 |
|---|---|---|
| committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 11:22:28 +0100 |
| commit | 142b343f6eb4898289c402afb6237def8e252a3e (patch) | |
| tree | ff562cc3fff80f4bdb12ed4873212515ee2220f5 /drivers/net/wireless/iwlegacy/iwl-3945.c | |
| parent | 841b2ccac3251fdbf7a0bc26724874cdc35df96c (diff) | |
| download | blackbird-op-linux-142b343f6eb4898289c402afb6237def8e252a3e.tar.gz blackbird-op-linux-142b343f6eb4898289c402afb6237def8e252a3e.zip | |
iwlegacy: mark poll bit as unlocked function
We do not take reg_lock during poll bit, so mark it such
using underscore.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-3945.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-3945.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c index 6e2e71acbef6..8c3ae39b0738 100644 --- a/drivers/net/wireless/iwlegacy/iwl-3945.c +++ b/drivers/net/wireless/iwlegacy/iwl-3945.c @@ -757,7 +757,7 @@ static void il3945_set_pwr_vmain(struct il_priv *il) APMG_PS_CTRL_VAL_PWR_SRC_VAUX, ~APMG_PS_CTRL_MSK_PWR_SRC); - il_poll_bit(il, CSR_GPIO_IN, + _il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VAUX_PWR_SRC, CSR_GPIO_IN_BIT_AUX_POWER, 5000); } @@ -767,7 +767,7 @@ static void il3945_set_pwr_vmain(struct il_priv *il) APMG_PS_CTRL_VAL_PWR_SRC_VMAIN, ~APMG_PS_CTRL_MSK_PWR_SRC); - il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC, + _il_poll_bit(il, CSR_GPIO_IN, CSR_GPIO_IN_VAL_VMAIN_PWR_SRC, CSR_GPIO_IN_BIT_AUX_POWER, 5000); /* uS */ } |
