diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /net/rfkill | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/rfkill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 1a47f5d1be17..140a0a8c6b02 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
| @@ -232,7 +232,7 @@ static int rfkill_suspend(struct device *dev, pm_message_t state) | |||
| 232 | struct rfkill *rfkill = to_rfkill(dev); | 232 | struct rfkill *rfkill = to_rfkill(dev); |
| 233 | 233 | ||
| 234 | if (dev->power.power_state.event != state.event) { | 234 | if (dev->power.power_state.event != state.event) { |
| 235 | if (state.event == PM_EVENT_SUSPEND) { | 235 | if (state.event & PM_EVENT_SLEEP) { |
| 236 | mutex_lock(&rfkill->mutex); | 236 | mutex_lock(&rfkill->mutex); |
| 237 | 237 | ||
| 238 | if (rfkill->state == RFKILL_STATE_ON) | 238 | if (rfkill->state == RFKILL_STATE_ON) |