Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 608fa3af authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: disable clock scaling before system suspend"

parents 2099acbf eafa96a1

drivers/mmc/core/core.c

+4 −2
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ bool mmc_can_scale_clk(struct mmc_host *host) 
		return false;

	}



	return host->caps2 & MMC_CAP2_CLK_SCALE;

	return (host->caps2 & MMC_CAP2_CLK_SCALE) &&

		(!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY));

}

EXPORT_SYMBOL(mmc_can_scale_clk);
@@ -749,7 +750,7 @@ int mmc_exit_clk_scaling(struct mmc_host *host) 
		return -EINVAL;

	}



	if (!mmc_can_scale_clk(host))

	if (!mmc_can_scale_clk(host) || !host->clk_scaling.enable)

		return 0;



	if (!host->clk_scaling.devfreq) {
@@ -3907,6 +3908,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, 
		spin_unlock_irqrestore(&host->lock, flags);

		cancel_delayed_work_sync(&host->detect);



		mmc_disable_clk_scaling(host);

		if (!host->bus_ops)

			break;