Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / libertas / if_usb.c

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index efaf850322089b3f6ef1c40219dc547020976767..6524c70363d9f507ac137c0482d3ff6094fd0ffd 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -345,6 +345,13 @@ static int if_usb_probe(struct usb_interface *intf,
        if (device_create_file(&priv->dev->dev, &dev_attr_lbs_flash_boot2))
                lbs_pr_err("cannot register lbs_flash_boot2 attribute\n");
 
+       /*
+        * EHS_REMOVE_WAKEUP is not supported on all versions of the firmware.
+        */
+       priv->wol_criteria = EHS_REMOVE_WAKEUP;
+       if (lbs_host_sleep_cfg(priv, priv->wol_criteria, NULL))
+               priv->ehs_remove_supported = false;
+
        return 0;
 
 err_start_card:
@@ -1090,12 +1097,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;