[PATCH] MIPS: I2C: Return -ETIMEDOUT in octeon_i2c_wait() on timeout

[PATCH] MIPS: I2C: Return -ETIMEDOUT in octeon_i2c_wait() on timeout

[Bernhard Walle]

It doesn't make sense to set result to -ETIMEDOUT but return 0 (success)
afterwards. Since there's code in octeon_i2c_start() to handle the
error, it should be called.

Signed-off-by: Bernhard Walle <walle-pDveNdigDaDu9UdzE1sIFA@public.gmane.org>
---
 drivers/i2c/busses/i2c-octeon.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index 0e9f85d..56dbe54 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -218,7 +218,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
 		return result;
 	} else if (result == 0) {
 		dev_dbg(i2c->dev, "%s: timeout\n", __func__);
-		result = -ETIMEDOUT;
+		return -ETIMEDOUT;
 	}
 
 	return 0;
-- 
1.7.0.4

Re: [PATCH] MIPS: I2C: Return -ETIMEDOUT in octeon_i2c_wait() on timeout

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]

On Mon, Sep 27, 2010 at 12:55:16PM +0200, Bernhard Walle wrote:
> It doesn't make sense to set result to -ETIMEDOUT but return 0 (success)
> afterwards. Since there's code in octeon_i2c_start() to handle the
> error, it should be called.
> 
> Signed-off-by: Bernhard Walle <walle-pDveNdigDaDu9UdzE1sIFA@public.gmane.org>

Acked-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>

but next time you should cc Ben Dooks to pick it up (i2c for embedded).

> ---
>  drivers/i2c/busses/i2c-octeon.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
> index 0e9f85d..56dbe54 100644
> --- a/drivers/i2c/busses/i2c-octeon.c
> +++ b/drivers/i2c/busses/i2c-octeon.c
> @@ -218,7 +218,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
>  		return result;
>  	} else if (result == 0) {
>  		dev_dbg(i2c->dev, "%s: timeout\n", __func__);
> -		result = -ETIMEDOUT;
> +		return -ETIMEDOUT;
>  	}
>  
>  	return 0;
> -- 
> 1.7.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] MIPS: I2C: Return -ETIMEDOUT in octeon_i2c_wait() on timeout

[David Daney]

On 09/27/2010 03:55 AM, Bernhard Walle wrote:
> It doesn't make sense to set result to -ETIMEDOUT but return 0 (success)
> afterwards. Since there's code in octeon_i2c_start() to handle the
> error, it should be called.
>
> Signed-off-by: Bernhard Walle<walle-pDveNdigDaDu9UdzE1sIFA@public.gmane.org>

Thanks for fixing this.

Acked-by: David Daney <ddaney-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org>


> ---
>   drivers/i2c/busses/i2c-octeon.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
> index 0e9f85d..56dbe54 100644
> --- a/drivers/i2c/busses/i2c-octeon.c
> +++ b/drivers/i2c/busses/i2c-octeon.c
> @@ -218,7 +218,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
>   		return result;
>   	} else if (result == 0) {
>   		dev_dbg(i2c->dev, "%s: timeout\n", __func__);
> -		result = -ETIMEDOUT;
> +		return -ETIMEDOUT;
>   	}
>
>   	return 0;

Re: [PATCH] MIPS: I2C: Return -ETIMEDOUT in octeon_i2c_wait() on timeout

[Ben Dooks]

On Mon, Sep 27, 2010 at 10:32:06AM -0700, David Daney wrote:
> On 09/27/2010 03:55 AM, Bernhard Walle wrote:
>> It doesn't make sense to set result to -ETIMEDOUT but return 0 (success)
>> afterwards. Since there's code in octeon_i2c_start() to handle the
>> error, it should be called.
>>
>> Signed-off-by: Bernhard Walle<walle-pDveNdigDaDu9UdzE1sIFA@public.gmane.org>
>
> Thanks for fixing this.
>
> Acked-by: David Daney <ddaney-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org>

Ok, will put into my for -rc6 branch.

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.