Explorar o código

Merge branch 'fixes' into next

Ulf Hansson %!s(int64=6) %!d(string=hai) anos
pai
achega
b7503e3dd8
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      drivers/net/wireless/marvell/libertas/if_sdio.c

+ 4 - 0
drivers/net/wireless/marvell/libertas/if_sdio.c

@@ -1317,6 +1317,10 @@ static int if_sdio_suspend(struct device *dev)
 	if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
 	if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
 		dev_info(dev, "Suspend without wake params -- powering down card\n");
 		dev_info(dev, "Suspend without wake params -- powering down card\n");
 		if (priv->fw_ready) {
 		if (priv->fw_ready) {
+			ret = lbs_suspend(priv);
+			if (ret)
+				return ret;
+
 			priv->power_up_on_resume = true;
 			priv->power_up_on_resume = true;
 			if_sdio_power_off(card);
 			if_sdio_power_off(card);
 		}
 		}