Commit b7503e3d authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents a7d247f5 4f666675

drivers/net/wireless/marvell/libertas/if_sdio.c

+4 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,10 @@ static int if_sdio_suspend(struct device *dev) 
	if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {

		dev_info(dev, "Suspend without wake params -- powering down card\n");

		if (priv->fw_ready) {

			ret = lbs_suspend(priv);

			if (ret)

				return ret;



			priv->power_up_on_resume = true;

			if_sdio_power_off(card);

		}