Skip to contentSkip to conversation

i2c: Fix 'ignore' module

PATCH New Greg KH 2 participants 3 messages Jul 12, 2006 – Jul 25, 2006 I2C

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/13 i2c: Fix 'ignore' module

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(-)
drivers/i2c/i2c-core.c +2 -2
index a45155f..9cb277d 100644
@@ -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;
Signature · 1 line
1.4.1
#1 lore raw

PATCH 1/13 i2c: Fix 'ignore' module

Hi all,

Quoted 18 lines

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(-)
drivers/i2c/i2c-core.c +0 -0
index a45155f..9cb277d 100644
@@ -756,9 +756,9 @@ int i2c_probe(struct i2c_adapter *adapte
 					"parameter for adapter %d, "

drivers/i2c/i2c-core.c int i2c_probe(struct i2c_adapter *adapte · line 764

Quoted 10 lines
drivers/i2c/i2c-core.c +2 -2
 					"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,

Signature · 1 line
Jean Delvare
author
#2 lore raw

PATCH 1/13 i2c: Fix 'ignore' module

In reply to Greg KH
Quoted 27 lines · Jean Delvare

Hi all,

Quoted 25 lines

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(-)
drivers/i2c/i2c-core.c +2 -2
index a45155f..9cb277d 100644
@@ -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;
Quoted 8 lines

drivers/i2c/i2c-core.c int i2c_probe(struct i2c_adapter *adapte · line 764

Quoted 3 lines
drivers/i2c/i2c-core.c +0 -0
 		}
 		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