diff options
| author | Axel Lin <axel.lin@ingics.com> | 2015-06-30 11:41:58 +0800 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2015-07-09 22:17:31 +0200 |
| commit | eb8173e3d7b94664ecd3acf34942c9c9d6f6cb73 (patch) | |
| tree | 728bb767487a23b0a3fe059656f377930b3d84b4 /drivers | |
| parent | 724948106ed236fc528c720ae12c79af7e2aea4e (diff) | |
| download | linux-eb8173e3d7b94664ecd3acf34942c9c9d6f6cb73.tar.gz linux-eb8173e3d7b94664ecd3acf34942c9c9d6f6cb73.tar.bz2 linux-eb8173e3d7b94664ecd3acf34942c9c9d6f6cb73.zip | |
i2c: jz4780: Fix return value if probe fails
Current code returns 0 if fails to read clock-frequency DT property,
fix it. Also add checking return value of clk_prepare_enable and
propagate return value of devm_request_irq.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-jz4780.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-jz4780.c b/drivers/i2c/busses/i2c-jz4780.c index 19b2d689a5ef..f325663c27c5 100644 --- a/drivers/i2c/busses/i2c-jz4780.c +++ b/drivers/i2c/busses/i2c-jz4780.c @@ -764,12 +764,15 @@ static int jz4780_i2c_probe(struct platform_device *pdev) if (IS_ERR(i2c->clk)) return PTR_ERR(i2c->clk); - clk_prepare_enable(i2c->clk); + ret = clk_prepare_enable(i2c->clk); + if (ret) + return ret; - if (of_property_read_u32(pdev->dev.of_node, "clock-frequency", - &clk_freq)) { + ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency", + &clk_freq); + if (ret) { dev_err(&pdev->dev, "clock-frequency not specified in DT"); - return clk_freq; + goto err; } i2c->speed = clk_freq / 1000; @@ -790,10 +793,8 @@ static int jz4780_i2c_probe(struct platform_device *pdev) i2c->irq = platform_get_irq(pdev, 0); ret = devm_request_irq(&pdev->dev, i2c->irq, jz4780_i2c_irq, 0, dev_name(&pdev->dev), i2c); - if (ret) { - ret = -ENODEV; + if (ret) goto err; - } ret = i2c_add_adapter(&i2c->adap); if (ret < 0) { |