diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:29 -0400 |
| commit | 8e00f5fbb4ecbc3431fa686cba60cd76a62604af (patch) | |
| tree | 78aa3bdef892dbd1afc8969fc528e529cfc266f7 /net/rfkill/core.c | |
| parent | 56fd49e399ce1d82200fad5b8924d4e35a587809 (diff) | |
| parent | 0874073570d9184a169a4ae2abbe8dbcb71878e9 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'net/rfkill/core.c')
| -rw-r--r-- | net/rfkill/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index be90640a2774..5be19575c340 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
| @@ -235,7 +235,7 @@ static bool __rfkill_set_hw_state(struct rfkill *rfkill, | |||
| 235 | else | 235 | else |
| 236 | rfkill->state &= ~RFKILL_BLOCK_HW; | 236 | rfkill->state &= ~RFKILL_BLOCK_HW; |
| 237 | *change = prev != blocked; | 237 | *change = prev != blocked; |
| 238 | any = rfkill->state & RFKILL_BLOCK_ANY; | 238 | any = !!(rfkill->state & RFKILL_BLOCK_ANY); |
| 239 | spin_unlock_irqrestore(&rfkill->lock, flags); | 239 | spin_unlock_irqrestore(&rfkill->lock, flags); |
| 240 | 240 | ||
| 241 | rfkill_led_trigger_event(rfkill); | 241 | rfkill_led_trigger_event(rfkill); |