]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles
authorJisheng Zhang <jszhang@marvell.com>
Wed, 28 Jan 2015 11:54:12 +0000 (19:54 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Mar 2015 22:57:27 +0000 (14:57 -0800)
commitde4adf92f9722206f3547eff5eeaae8b632266c6
treeec639dbe3f32668302e48756d90ab4dc838ca13c
parent20b85db94c1f4f3f86a83812b817d96fa37db61c
mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles

commit 14460dbaf7a5a0488963fdb8232ad5c8a8cca7b7 upstream.

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>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/sdhci-pxav3.c