aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2010-10-31 09:40:12 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-11-16 16:37:02 -0500
commitcf43298864fdfd687202db8c736473522bfceb98 (patch)
tree0c546d4f179c2379f763aa5403bed1cd7d5e6410 /drivers/net/wireless/libertas
parentb1d771ee33c6e4006676002b9d74abf45b71d3d6 (diff)
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>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/if_usb.c6
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 efaf85032208..35931cf4d6db 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)
1090 if (priv->psstate != PS_STATE_FULL_POWER) 1090 if (priv->psstate != PS_STATE_FULL_POWER)
1091 return -1; 1091 return -1;
1092 1092
1093 if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
1094 lbs_pr_info("Suspend attempt without "
1095 "configuring wake params!\n");
1096 return -ENOSYS;
1097 }
1098
1099 ret = lbs_suspend(priv); 1093 ret = lbs_suspend(priv);
1100 if (ret) 1094 if (ret)
1101 goto out; 1095 goto out;