diff options
| author | Daniel Drake <dsd@laptop.org> | 2010-10-31 13:40:12 +0000 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-16 16:37:02 -0500 |
| commit | cf43298864fdfd687202db8c736473522bfceb98 (patch) | |
| tree | 0c546d4f179c2379f763aa5403bed1cd7d5e6410 | |
| parent | b1d771ee33c6e4006676002b9d74abf45b71d3d6 (diff) | |
| download | linux-3.10-cf43298864fdfd687202db8c736473522bfceb98.tar.gz linux-3.10-cf43298864fdfd687202db8c736473522bfceb98.tar.bz2 linux-3.10-cf43298864fdfd687202db8c736473522bfceb98.zip | |
libertas: don't block usb8388 suspend if no wakeup conditions are set
This hunk added by commit 66fceb69b72f seems erroneous. We don't want to
prevent suspend of the whole system if no wakeup params are set.
In the case of the usb8388 we do want to keep the card powered up even
if there are no wakeup params. This is because it will continue acting
as a mesh node.
If the mesh is disabled, it would indeed make more sense to power down
the card during suspend, as the equivalent hunk does for the SD interface.
But that's a separate task; for now just restore the previous behaviour.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index efaf8503220..35931cf4d6d 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -1090,12 +1090,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) if (priv->psstate != PS_STATE_FULL_POWER) return -1; - if (priv->wol_criteria == EHS_REMOVE_WAKEUP) { - lbs_pr_info("Suspend attempt without " - "configuring wake params!\n"); - return -ENOSYS; - } - ret = lbs_suspend(priv); if (ret) goto out; |