aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host
diff options
context:
space:
mode:
authorTomasz Figa <tomasz.figa@gmail.com>2014-01-11 16:39:03 -0500
committerChris Ball <chris@printf.net>2014-03-03 10:23:22 -0500
commit8f4b78d9bb042aacce43e0213c727da861a128f6 (patch)
treea5bbebacd0a16499c395128eacfc5074848f5b9b /drivers/mmc/host
parent6eb28bdcb27249ca9981fb063d3f2485fd344500 (diff)
mmc: sdhci-s3c: Use correct condition to check for clock presence
IS_ERR() must be used to make sure that not a valid clock was returned by clk_get() and company. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Jaehoon Chung <jh80.chung@samsung.com> Acked-by; Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc/host')
-rw-r--r--drivers/mmc/host/sdhci-s3c.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 9b783915b02a..7fde938facb0 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -147,7 +147,7 @@ static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
147 struct clk *clksrc = ourhost->clk_bus[src]; 147 struct clk *clksrc = ourhost->clk_bus[src];
148 int shift; 148 int shift;
149 149
150 if (!clksrc) 150 if (IS_ERR(clksrc))
151 return UINT_MAX; 151 return UINT_MAX;
152 152
153 /* 153 /*
@@ -567,16 +567,14 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
567 clk_prepare_enable(sc->clk_io); 567 clk_prepare_enable(sc->clk_io);
568 568
569 for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) { 569 for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
570 struct clk *clk;
571 char name[14]; 570 char name[14];
572 571
573 snprintf(name, 14, "mmc_busclk.%d", ptr); 572 snprintf(name, 14, "mmc_busclk.%d", ptr);
574 clk = devm_clk_get(dev, name); 573 sc->clk_bus[ptr] = devm_clk_get(dev, name);
575 if (IS_ERR(clk)) 574 if (IS_ERR(sc->clk_bus[ptr]))
576 continue; 575 continue;
577 576
578 clks++; 577 clks++;
579 sc->clk_bus[ptr] = clk;
580 578
581 /* 579 /*
582 * save current clock index to know which clock bus 580 * save current clock index to know which clock bus