]> 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)
committerJiri Slaby <jslaby@suse.cz>
Sun, 1 Mar 2015 22:34:17 +0000 (23:34 +0100)
commit04333c0b73dfddeba3d2bdeb5198b220b4a21695
tree627604162da90d158d092efdf0b4f978dd548fa3
parent5e1b3dc7688187c293c3005696b0a917b9286383
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: Jiri Slaby <jslaby@suse.cz>
drivers/mmc/host/sdhci-pxav3.c