diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2016-04-03 17:32:00 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2016-04-09 02:36:44 -0400 |
commit | caf280800aaf73f0796d1bb3fa0f6576c8222258 (patch) | |
tree | 19e022711c6b8b2fc3b67ed87ab4676a2bd3e291 | |
parent | 4ececb7d173f17c60c00e704a0e4e51cdf788e04 (diff) |
i2c: jz4780: really prevent potential division by zero
Make sure we avoid a division-by-zero OOPS in case clock-frequency is
set too low in DT. Add missing '\n' while we are here.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Axel Lin <axel.lin@ingics.com>
-rw-r--r-- | drivers/i2c/busses/i2c-jz4780.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-jz4780.c b/drivers/i2c/busses/i2c-jz4780.c index f325663c27c5..ba14a863b451 100644 --- a/drivers/i2c/busses/i2c-jz4780.c +++ b/drivers/i2c/busses/i2c-jz4780.c | |||
@@ -771,11 +771,16 @@ static int jz4780_i2c_probe(struct platform_device *pdev) | |||
771 | ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency", | 771 | ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency", |
772 | &clk_freq); | 772 | &clk_freq); |
773 | if (ret) { | 773 | if (ret) { |
774 | dev_err(&pdev->dev, "clock-frequency not specified in DT"); | 774 | dev_err(&pdev->dev, "clock-frequency not specified in DT\n"); |
775 | goto err; | 775 | goto err; |
776 | } | 776 | } |
777 | 777 | ||
778 | i2c->speed = clk_freq / 1000; | 778 | i2c->speed = clk_freq / 1000; |
779 | if (i2c->speed == 0) { | ||
780 | ret = -EINVAL; | ||
781 | dev_err(&pdev->dev, "clock-frequency minimum is 1000\n"); | ||
782 | goto err; | ||
783 | } | ||
779 | jz4780_i2c_set_speed(i2c); | 784 | jz4780_i2c_set_speed(i2c); |
780 | 785 | ||
781 | dev_info(&pdev->dev, "Bus frequency is %d KHz\n", i2c->speed); | 786 | dev_info(&pdev->dev, "Bus frequency is %d KHz\n", i2c->speed); |