public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: sdhci-s3c: Use correct condition to check for clock presence

Browse source 
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>
This commit is contained in:
Tomasz Figa 2014-01-11 22:39:03 +01:00 • committed by Chris Ball
parent 6eb28bdcb2
commit 8f4b78d9bb
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mmc/host/sdhci-s3c.c
View file

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