mmc: sdhci-s3c: Use correct condition to check for clock presence
authorTomasz Figa <tomasz.figa@gmail.com>
Sat, 11 Jan 2014 21:39:03 +0000 (22:39 +0100)
committerChris Ball <chris@printf.net>
Mon, 3 Mar 2014 15:23:22 +0000 (10:23 -0500)
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>
drivers/mmc/host/sdhci-s3c.c

index 9b783915b02a08b3710598612e9508f75ed22764..7fde938facb0b57b64e6371a5384ff2c8bd3f5ff 100644 (file)
@@ -147,7 +147,7 @@ static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
        struct clk *clksrc = ourhost->clk_bus[src];
        int shift;
 
-       if (!clksrc)
+       if (IS_ERR(clksrc))
                return UINT_MAX;
 
        /*
@@ -567,16 +567,14 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
        clk_prepare_enable(sc->clk_io);
 
        for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
-               struct clk *clk;
                char name[14];
 
                snprintf(name, 14, "mmc_busclk.%d", ptr);
-               clk = devm_clk_get(dev, name);
-               if (IS_ERR(clk))
+               sc->clk_bus[ptr] = devm_clk_get(dev, name);
+               if (IS_ERR(sc->clk_bus[ptr]))
                        continue;
 
                clks++;
-               sc->clk_bus[ptr] = clk;
 
                /*
                 * save current clock index to know which clock bus