|
@@ -1041,11 +1041,9 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
- * If the host supports the power_off_notify capability then
|
|
|
- * set the notification byte in the ext_csd register of device
|
|
|
+ * Enable power_off_notification byte in the ext_csd register
|
|
|
*/
|
|
|
- if ((host->caps2 & MMC_CAP2_POWEROFF_NOTIFY) &&
|
|
|
- (card->ext_csd.rev >= 6)) {
|
|
|
+ if (card->ext_csd.rev >= 6) {
|
|
|
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
|
|
|
EXT_CSD_POWER_OFF_NOTIFICATION,
|
|
|
EXT_CSD_POWER_ON,
|
|
@@ -1485,7 +1483,8 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend)
|
|
|
if (err)
|
|
|
goto out;
|
|
|
|
|
|
- if (mmc_can_poweroff_notify(host->card))
|
|
|
+ if (mmc_can_poweroff_notify(host->card) &&
|
|
|
+ ((host->caps2 & MMC_CAP2_POWEROFF_NOTIFY) || !is_suspend))
|
|
|
err = mmc_poweroff_notify(host->card, notify_type);
|
|
|
else if (mmc_can_sleep(host->card))
|
|
|
err = mmc_sleep(host);
|