diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-04-19 15:15:48 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-04-19 15:20:03 -0700 |
| commit | 94225ab0bef6f32108eaa410bb894caa2b4317e2 (patch) | |
| tree | 3696c83cc5109c7e439c8228fe6be72a3a4a74fe /drivers/net/wireless/iwlwifi/iwl-rx.c | |
| parent | 801cb6260fb5cae3bbc513927b583447c38d9deb (diff) | |
| parent | 0527fde0639955203ad48a9fd83bd6fc35e82e07 (diff) | |
| download | kernel_samsung_aries-94225ab0bef6f32108eaa410bb894caa2b4317e2.zip kernel_samsung_aries-94225ab0bef6f32108eaa410bb894caa2b4317e2.tar.gz kernel_samsung_aries-94225ab0bef6f32108eaa410bb894caa2b4317e2.tar.bz2 | |
Merge linux-stable 3.0.28 into android-3.0
Change-Id: Iee820738e53627f5d0447a87ceff34443aa72786
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index b774517..865ac1a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c @@ -738,7 +738,7 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv, wiphy_rfkill_set_hw_state(priv->hw->wiphy, test_bit(STATUS_RF_KILL_HW, &priv->status)); else - wake_up_interruptible(&priv->wait_command_queue); + wake_up(&priv->wait_command_queue); } static void iwl_rx_missed_beacon_notif(struct iwl_priv *priv, |