Browse Source

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>
Chen-Yu Tsai 11 năm trước cách đây
mục cha
commit
0ce4bc1dbd
1 tập tin đã thay đổi với 1 bổ sung2 xóa
  1. 1 2
      drivers/i2c/busses/i2c-mv64xxx.c

+ 1 - 2
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);
 	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 */
 		bus_freq = 100000; /* 100kHz by default */
 
 
 	if (!mv64xxx_find_baud_factors(bus_freq, tclk,
 	if (!mv64xxx_find_baud_factors(bus_freq, tclk,