| From e222e9e3baa43a0ae2544264ae609241c096885d Mon Sep 17 00:00:00 2001 |
| From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Date: Thu, 12 Sep 2013 14:36:47 +0200 |
| Subject: i2c: rcar: fix clk_get() error handling |
| |
| When clk_get() fails, it returns an error code, not a NULL. This patch |
| fixes such an error handling bug. |
| |
| Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit 330c824a49cd49dd7e61c1e397fa4e7380ba2c68) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/i2c/busses/i2c-rcar.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c |
| index 056323b0666a..e5e79a031827 100644 |
| --- a/drivers/i2c/busses/i2c-rcar.c |
| +++ b/drivers/i2c/busses/i2c-rcar.c |
| @@ -234,9 +234,9 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv, |
| u32 cdf_width; |
| unsigned long rate; |
| |
| - if (!clkp) { |
| - dev_err(dev, "there is no peripheral_clk\n"); |
| - return -EIO; |
| + if (IS_ERR(clkp)) { |
| + dev_err(dev, "couldn't get clock\n"); |
| + return PTR_ERR(clkp); |
| } |
| |
| switch (priv->devtype) { |
| -- |
| 1.8.5.rc3 |
| |
