Commit 14460dba authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Ulf Hansson

mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles

Current code checks "clk_delay_cycles > 0" to know whether the optional
"mrvl,clk_delay_cycles" is set or not. But of_property_read_u32() doesn't
touch clk_delay_cycles if the property is not set. And type of
clk_delay_cycles is u32, so we may always set pdata->clk_delay_cycles as a
random value.

This patch fix this problem by check the return value of of_property_read_u32()
to know whether the optional clk-delay-cycles is set or not.
Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Cc: <stable@vger.kernel.org> # v3.6+
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 96083379
...@@ -268,8 +268,8 @@ static struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev) ...@@ -268,8 +268,8 @@ static struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev)
if (!pdata) if (!pdata)
return NULL; return NULL;
of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); if (!of_property_read_u32(np, "mrvl,clk-delay-cycles",
if (clk_delay_cycles > 0) &clk_delay_cycles))
pdata->clk_delay_cycles = clk_delay_cycles; pdata->clk_delay_cycles = clk_delay_cycles;
return pdata; return pdata;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment