mmc: sdhci-esdhc: break out early if clock is 0
authorShawn Guo <shawn.guo@linaro.org>
Wed, 22 Aug 2012 15:10:01 +0000 (23:10 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 19 Sep 2012 14:04:39 +0000 (15:04 +0100)
commita0d9ef18e6578ebce77372896fa8fb1ba19e1612
tree1065797f62c1d2a8beb7006afa6ec8d208edbc85
parent3a0ae8e18c188a90c8a54fd26d18d6da5a084892
mmc: sdhci-esdhc: break out early if clock is 0

commit 74f330bceaa7b88d06062e1cac3d519a3dfc041e upstream.

Since commit 30832ab56 ("mmc: sdhci: Always pass clock request value
zero to set_clock host op") was merged, esdhc_set_clock starts hitting
"if (clock == 0)" where ESDHC_SYSTEM_CONTROL has been operated.  This
causes SDHCI card-detection function being broken.  Fix the regression
by moving "if (clock == 0)" above ESDHC_SYSTEM_CONTROL operation.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/mmc/host/sdhci-esdhc.h