X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Frfkill%2Frfkill.c;h=140a0a8c6b02fe5e5f4f4d0177a947aeb51d1692;hb=7524d7d6de5d5d3f081de8cf5479819fad339661;hp=6562f868e82f07d7ce70169ef2920c41c07c1ae6;hpb=303d9bf6bb64ead8e3f1d7e29904a4025502e591;p=linux-2.6 diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 6562f868e8..140a0a8c6b 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) struct rfkill *rfkill = to_rfkill(dev); if (dev->power.power_state.event != state.event) { - if (state.event == PM_EVENT_SUSPEND) { + if (state.event & PM_EVENT_SLEEP) { mutex_lock(&rfkill->mutex); if (rfkill->state == RFKILL_STATE_ON) @@ -340,7 +340,7 @@ EXPORT_SYMBOL(rfkill_allocate); * rfkill_free - Mark rfkill structure for deletion * @rfkill: rfkill structure to be destroyed * - * Decrements reference count of rfkill structure so it is destoryed. + * Decrements reference count of rfkill structure so it is destroyed. * Note that rfkill_free() should _not_ be called after rfkill_unregister(). */ void rfkill_free(struct rfkill *rfkill)