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

Commit 6e3076c2 authored by Balaji T K's avatar Balaji T K Committed by Chris Ball
Browse files

mmc: omap_hsmmc: save clock rate to use in interrupt context 



clk_get_rate throws DEBUG_LOCKS_WARN_ON(in_interrupt()) warning
if called from interrupt context.
use cached clock rate in set_data_timeout, so that
set_data_timeout can be called from interrupt context.

Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 4ea42235

drivers/mmc/host/omap_hsmmc.c

+3 −1
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ struct omap_hsmmc_host { 
	int			reqs_blocked;

	int			use_reg;

	int			req_in_progress;

	unsigned long		clk_rate;

	struct omap_hsmmc_next	next_data;

	struct	omap_mmc_platform_data	*pdata;

};
@@ -1360,7 +1361,7 @@ static void set_data_timeout(struct omap_hsmmc_host *host, 
	if (clkd == 0)

		clkd = 1;



	cycle_ns = 1000000000 / (clk_get_rate(host->fclk) / clkd);

	cycle_ns = 1000000000 / (host->clk_rate / clkd);

	timeout = timeout_ns / cycle_ns;

	timeout += timeout_clks;

	if (timeout) {
@@ -1484,6 +1485,7 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req) 
		host->reqs_blocked = 0;

	WARN_ON(host->mrq != NULL);

	host->mrq = req;

	host->clk_rate = clk_get_rate(host->fclk);

	err = omap_hsmmc_prepare_data(host, req);

	if (err) {

		req->cmd->error = err;