[lm-sensors] [PATCH 1/13] [PATCH] i2c: Fix 'ignore' module

[lm-sensors] [PATCH 1/13] [PATCH] i2c: Fix 'ignore' module

[Greg KH]

From: Mark M. Hoffman <mhoffman at lightlink.com>

This patch fixes a bug in the handling of 'ignore' module parameters of I2C
client drivers.

Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/i2c/i2c-core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index a45155f..9cb277d 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -756,9 +756,9 @@ int i2c_probe(struct i2c_adapter *adapte
 					"parameter for adapter %d, "
 					"addr 0x%02x\n", adap_id,
 					address_data->ignore[j + 1]);
+				ignore = 1;
+				break;
 			}
-			ignore = 1;
-			break;
 		}
 		if (ignore)
 			continue;
-- 
1.4.1

[lm-sensors] [PATCH 1/13] [PATCH] i2c: Fix 'ignore' module

[Jean Delvare]

Hi all,

> From: Mark M. Hoffman <mhoffman at lightlink.com>
> 
> This patch fixes a bug in the handling of 'ignore' module parameters of I2C
> client drivers.
> 
> Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
> Signed-off-by: Jean Delvare <khali at linux-fr.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
> ---
>  drivers/i2c/i2c-core.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index a45155f..9cb277d 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -756,9 +756,9 @@ int i2c_probe(struct i2c_adapter *adapte
>  					"parameter for adapter %d, "
>  					"addr 0x%02x\n", adap_id,
>  					address_data->ignore[j + 1]);
> +				ignore = 1;
> +				break;
>  			}
> -			ignore = 1;
> -			break;
>  		}
>  		if (ignore)
>  			continue;

I am wondering, do we want to put this fix in 2.6.17.y (and 2.6.16.y)?
It is a regression, it affects virtually every i2c chip driver and the
fix is straightforward, but OTOH it has been broken since 2.6.14-rc1 (10
months ago) and nobody ever complained. Opinion anyone?

Thanks,
-- 
Jean Delvare

[lm-sensors] [PATCH 1/13] [PATCH] i2c: Fix 'ignore' module

[Greg KH]

On Tue, Jul 25, 2006 at 09:05:18PM +0200, Jean Delvare wrote:
> Hi all,
> 
> > From: Mark M. Hoffman <mhoffman at lightlink.com>
> > 
> > This patch fixes a bug in the handling of 'ignore' module parameters of I2C
> > client drivers.
> > 
> > Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
> > Signed-off-by: Jean Delvare <khali at linux-fr.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
> > ---
> >  drivers/i2c/i2c-core.c |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> > index a45155f..9cb277d 100644
> > --- a/drivers/i2c/i2c-core.c
> > +++ b/drivers/i2c/i2c-core.c
> > @@ -756,9 +756,9 @@ int i2c_probe(struct i2c_adapter *adapte
> >  					"parameter for adapter %d, "
> >  					"addr 0x%02x\n", adap_id,
> >  					address_data->ignore[j + 1]);
> > +				ignore = 1;
> > +				break;
> >  			}
> > -			ignore = 1;
> > -			break;
> >  		}
> >  		if (ignore)
> >  			continue;
> 
> I am wondering, do we want to put this fix in 2.6.17.y (and 2.6.16.y)?
> It is a regression, it affects virtually every i2c chip driver and the
> fix is straightforward, but OTOH it has been broken since 2.6.14-rc1 (10
> months ago) and nobody ever complained. Opinion anyone?

Sounds good to me, send it to stable at kernel.org and I'll add it to the
queue.

thanks,

greg k-h