diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2014-09-01 22:28:13 +0800 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2014-09-02 12:34:08 +0200 |
| commit | 0ce4bc1dbdd911ae1763e2d4ff36bd1b214a59f7 (patch) | |
| tree | 0e2c99c48bb50cbafa8c9e3d5641067a720fd24b /drivers | |
| parent | dd318b0df27c582ac0d72a346fd6e693700be23c (diff) | |
| download | linux-stable-0ce4bc1dbdd911ae1763e2d4ff36bd1b214a59f7.tar.gz linux-stable-0ce4bc1dbdd911ae1763e2d4ff36bd1b214a59f7.tar.bz2 linux-stable-0ce4bc1dbdd911ae1763e2d4ff36bd1b214a59f7.zip | |
i2c: mv64xxx: continue probe when clock-frequency is missing
The "clock-frequency" DT property is listed as optional, However,
the current code stores the return value of of_property_read_u32 in
the return code of mv64xxx_of_config, but then forgets to clear it
after setting the default value of "clock-frequency". It is then
passed out to the main probe function, resulting in a probe failure
when "clock-frequency" is missing.
This patch checks and then throws away the return value of
of_property_read_u32, instead of storing it and having to clear it
afterwards.
This issue was discovered after the property was removed from all
sunxi DTs.
Fixes: 4c730a06c19bb ("i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Cc: stable@vger.kernel.org
Acked-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 6dc5ded86f62..2f64273d3f2b 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -746,8 +746,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, } tclk = clk_get_rate(drv_data->clk); - rc = of_property_read_u32(np, "clock-frequency", &bus_freq); - if (rc) + if (of_property_read_u32(np, "clock-frequency", &bus_freq)) bus_freq = 100000; /* 100kHz by default */ if (!mv64xxx_find_baud_factors(bus_freq, tclk, |