diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index aaea51ee418..387eeeedb41 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -316,7 +316,7 @@ int iwl_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx) | |||
316 | 316 | ||
317 | conf = &priv->hw->conf; | 317 | conf = &priv->hw->conf; |
318 | 318 | ||
319 | lockdep_assert_held(&priv->shrd->mutex); | 319 | lockdep_assert_held(&priv->mutex); |
320 | 320 | ||
321 | memset(&ctx->timing, 0, sizeof(struct iwl_rxon_time_cmd)); | 321 | memset(&ctx->timing, 0, sizeof(struct iwl_rxon_time_cmd)); |
322 | 322 | ||
@@ -892,7 +892,7 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) | |||
892 | bool defer; | 892 | bool defer; |
893 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; | 893 | struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; |
894 | 894 | ||
895 | lockdep_assert_held(&priv->shrd->mutex); | 895 | lockdep_assert_held(&priv->mutex); |
896 | 896 | ||
897 | if (priv->tx_power_user_lmt == tx_power && !force) | 897 | if (priv->tx_power_user_lmt == tx_power && !force) |
898 | return 0; | 898 | return 0; |