mwifiex: report error to MMC core if we cannot suspend (dd321acd) · Commits · 戴 / test

When host_sleep_config command fails we should return error to MMC core to indicate the failure for our device. The misspelled variable is also removed as it's redundant. Cc: "3.0+" <stable@vger.kernel.org> Signed-off-by:

Bing Zhao <bzhao@marvell.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/mwifiex/sdio.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@ static int mwifiex_sdio_suspend(struct device *dev)
		struct sdio_mmc_card *card;
		struct mwifiex_adapter *adapter;
		mmc_pm_flag_t pm_flag = 0;
		int hs_actived = 0;
		int i;
		int ret = 0;

		@@ -188,12 +187,14 @@ static int mwifiex_sdio_suspend(struct device *dev)
		adapter = card->adapter;

		/* Enable the Host Sleep */
		hs_actived = mwifiex_enable_hs(adapter);
		if (hs_actived) {
		pr_debug("cmd: suspend with MMC_PM_KEEP_POWER\n");
		ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
		if (!mwifiex_enable_hs(adapter)) {
		dev_err(adapter->dev, "cmd: failed to suspend\n");
		return -EFAULT;
		}

		dev_dbg(adapter->dev, "cmd: suspend with MMC_PM_KEEP_POWER\n");
		ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);

		/* Indicate device suspended */
		adapter->is_suspended = true;

Admin message