libertas: EHS_REMOVE_WAKEUP is not always supported
Certain firmware versions, particularly the 8388 found on the XO-1, do not support the EHS_REMOVE_WAKEUP command that is used to disable WOL. Sending this command to the card will return a failure that would get propagated up the stack and cause suspend to fail. Instead, fall back to an all-zero wakeup mask. This fixes http://dev.laptop.org/ticket/9967 Signed-off-by: Deepak Saxena <dsaxena@laptop.org> Signed-off-by: Daniel Drake <dsd@laptop.org> [includes fixups by Paul Fox] Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
cf43298864
commit
ae63a33ec9
@@ -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:
|
||||
|
Reference in New Issue
Block a user