diff options
Diffstat (limited to 'drivers/net/wireless/libertas/if_usb.c')
-rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index efaf85032208..6524c70363d9 100644 --- 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, | |||
345 | if (device_create_file(&priv->dev->dev, &dev_attr_lbs_flash_boot2)) | 345 | if (device_create_file(&priv->dev->dev, &dev_attr_lbs_flash_boot2)) |
346 | lbs_pr_err("cannot register lbs_flash_boot2 attribute\n"); | 346 | lbs_pr_err("cannot register lbs_flash_boot2 attribute\n"); |
347 | 347 | ||
348 | /* | ||
349 | * EHS_REMOVE_WAKEUP is not supported on all versions of the firmware. | ||
350 | */ | ||
351 | priv->wol_criteria = EHS_REMOVE_WAKEUP; | ||
352 | if (lbs_host_sleep_cfg(priv, priv->wol_criteria, NULL)) | ||
353 | priv->ehs_remove_supported = false; | ||
354 | |||
348 | return 0; | 355 | return 0; |
349 | 356 | ||
350 | err_start_card: | 357 | err_start_card: |
@@ -1090,12 +1097,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) | |||
1090 | if (priv->psstate != PS_STATE_FULL_POWER) | 1097 | if (priv->psstate != PS_STATE_FULL_POWER) |
1091 | return -1; | 1098 | return -1; |
1092 | 1099 | ||
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); | 1100 | ret = lbs_suspend(priv); |
1100 | if (ret) | 1101 | if (ret) |
1101 | goto out; | 1102 | goto out; |