stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Daniel Mack <daniel@zonque.org>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.9 8/9] libertas: call into generic suspend code before turning off power
Date: Mon, 22 Oct 2018 06:21:32 -0400	[thread overview]
Message-ID: <20181022102133.41222-8-sashal@kernel.org> (raw)
In-Reply-To: <20181022102133.41222-1-sashal@kernel.org>

From: Daniel Mack <daniel@zonque.org>

[ Upstream commit 4f666675cdff0b986195413215eb062b7da6586f ]

When powering down a SDIO connected card during suspend, make sure to call
into the generic lbs_suspend() function before pulling the plug. This will
make sure the card is successfully deregistered from the system to avoid
communication to the card starving out.

Fixes: 7444a8092906 ("libertas: fix suspend and resume for SDIO connected cards")
Signed-off-by: Daniel Mack <daniel@zonque.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/wireless/marvell/libertas/if_sdio.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c
index a0ae8d8763bb..06a57c708992 100644
--- a/drivers/net/wireless/marvell/libertas/if_sdio.c
+++ b/drivers/net/wireless/marvell/libertas/if_sdio.c
@@ -1368,6 +1368,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);
 		}
-- 
2.17.1

  parent reply	other threads:[~2018-10-22 10:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-22 10:21 [PATCH AUTOSEL 4.9 1/9] ARM: dts: imx53-qsb: disable 1.2GHz OPP Sasha Levin
2018-10-22 10:21 ` [PATCH AUTOSEL 4.9 2/9] Input: mousedev - add a schedule point in mousedev_write() Sasha Levin
2018-10-22 10:21 ` [PATCH AUTOSEL 4.9 3/9] Input: evdev - add a schedule point in evdev_write() Sasha Levin
2018-10-22 10:21 ` [PATCH AUTOSEL 4.9 4/9] Input: uinput - add a schedule point in uinput_inject_events() Sasha Levin
2018-10-22 10:21 ` [PATCH AUTOSEL 4.9 5/9] rxrpc: Don't check RXRPC_CALL_TX_LAST after calling rxrpc_rotate_tx_window() Sasha Levin
2018-10-22 10:21 ` [PATCH AUTOSEL 4.9 6/9] rxrpc: Only take the rwind and mtu values from latest ACK Sasha Levin
2018-10-22 10:21 ` [PATCH AUTOSEL 4.9 7/9] net: ena: fix NULL dereference due to untimely napi initialization Sasha Levin
2018-10-22 10:21 ` Sasha Levin [this message]
2018-10-22 10:21 ` [PATCH AUTOSEL 4.9 9/9] fs/fat/fatent.c: add cond_resched() to fat_count_free_clusters() Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181022102133.41222-8-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=daniel@zonque.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).