diff --git a/[refs] b/[refs] index 0e57f3eea4c0..439f9667c393 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 253e0a7c3dc4bbbc69fc6bfd7c01bc4c9397a5e5 +refs/heads/master: c288b85554097a3d1271f935c48b442280b2db9e diff --git a/trunk/drivers/mmc/core/host.c b/trunk/drivers/mmc/core/host.c index 92e33703e437..b3ac6c5bc5c6 100644 --- a/trunk/drivers/mmc/core/host.c +++ b/trunk/drivers/mmc/core/host.c @@ -235,7 +235,8 @@ static inline void mmc_host_clk_exit(struct mmc_host *host) mmc_host_clk_gate_delayed(host); if (host->clk_gated) mmc_host_clk_ungate(host); - BUG_ON(host->clk_requests > 0); + /* There should be only one user now */ + WARN_ON(host->clk_requests > 1); } #else