mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
mmc: core: Fix setting power notify state variable for non-eMMC
This patch skips the setting of the power notify state variable for non eMMC 4.5 devices. Also fixes the problem of omap_hsmmc noisy/broken for suspend resume reported by Kevin Hilman. Signed-off-by: Girish K S <girish.shivananjappa@linaro.org> Acked-by: Ulf Hansson <ulf.hansson@stericsson.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
6de5fc9cf7
commit
96a85d548b
1 changed files with 7 additions and 3 deletions
|
@ -883,10 +883,14 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
|
|||
card->ext_csd.generic_cmd6_time);
|
||||
if (err && err != -EBADMSG)
|
||||
goto free_card;
|
||||
}
|
||||
|
||||
if (!err)
|
||||
card->poweroff_notify_state = MMC_POWERED_ON;
|
||||
/*
|
||||
* The err can be -EBADMSG or 0,
|
||||
* so check for success and update the flag
|
||||
*/
|
||||
if (!err)
|
||||
card->poweroff_notify_state = MMC_POWERED_ON;
|
||||
}
|
||||
|
||||
/*
|
||||
* Activate high speed (if supported)
|
||||
|
|
Loading…
Reference in a new issue