From 066af983c74162fa98e7c5ffa8a5ead4a6979b1f Mon Sep 17 00:00:00 2001 From: Rodolfo Giometti Date: Thu, 12 Jul 2007 14:12:30 +0200 Subject: [PATCH] i2c-pxa: Support new-style I2C drivers Signed-off-by: Rodolfo Giometti Signed-off-by: Jean Delvare --- drivers/i2c/busses/i2c-pxa.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 28e7b91..9d6b790 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -921,7 +921,14 @@ static int i2c_pxa_probe(struct platform_device *dev) i2c->adap.class = plat->class; } - ret = i2c_add_adapter(&i2c->adap); + /* + * If "dev->id" is negative we consider it as zero. + * The reason to do so is to avoid sysfs names that only make + * sense when there are multiple adapters. + */ + i2c->adap.nr = dev->id >= 0 ? dev->id : 0; + + ret = i2c_add_numbered_adapter(&i2c->adap); if (ret < 0) { printk(KERN_INFO "I2C: Failed to add bus\n"); goto eadapt; -- 2.7.4