3.16.62-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Daniel Mack <[email protected]> commit 4f666675cdff0b986195413215eb062b7da6586f upstream. 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 <[email protected]> Reviewed-by: Ulf Hansson <[email protected]> Acked-by: Kalle Valo <[email protected]> Signed-off-by: Ulf Hansson <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- drivers/net/wireless/libertas/if_sdio.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -1369,6 +1369,10 @@ static int if_sdio_suspend(struct device 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); }
