| Message ID | 1422446052-2323-1-git-send-email-jszhang@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 28 January 2015 at 12:54, Jisheng Zhang <jszhang@marvell.com> wrote: > 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: Jisheng Zhang <jszhang@marvell.com> > Cc: <stable@vger.kernel.org> # v3.6+ Thanks! Applied for next. Kind regards Uffe > --- > drivers/mmc/host/sdhci-pxav3.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > index c5db5d2..f1c6362 100644 > --- a/drivers/mmc/host/sdhci-pxav3.c > +++ b/drivers/mmc/host/sdhci-pxav3.c > @@ -268,8 +268,8 @@ static struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev) > if (!pdata) > return NULL; > > - of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); > - if (clk_delay_cycles > 0) > + if (!of_property_read_u32(np, "mrvl,clk-delay-cycles", > + &clk_delay_cycles)) > pdata->clk_delay_cycles = clk_delay_cycles; > > return pdata; > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index c5db5d2..f1c6362 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -268,8 +268,8 @@ static struct sdhci_pxa_platdata *pxav3_get_mmc_pdata(struct device *dev) if (!pdata) return NULL; - of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); - if (clk_delay_cycles > 0) + if (!of_property_read_u32(np, "mrvl,clk-delay-cycles", + &clk_delay_cycles)) pdata->clk_delay_cycles = clk_delay_cycles; return pdata;
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: Jisheng Zhang <jszhang@marvell.com> Cc: <stable@vger.kernel.org> # v3.6+ --- drivers/mmc/host/sdhci-pxav3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)