diff options
| author | Rodolfo Giometti <giometti@enneenne.com> | 2007-07-12 14:12:30 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@hyperion.delvare> | 2007-07-12 14:12:30 +0200 |
| commit | 066af983c74162fa98e7c5ffa8a5ead4a6979b1f (patch) | |
| tree | 175db335af8519db99b0c303f9906760161ee35f /drivers/i2c | |
| parent | 4d6ceed4426cd85e1203a3153246334a3537f92b (diff) | |
| download | op-kernel-dev-066af983c74162fa98e7c5ffa8a5ead4a6979b1f.zip op-kernel-dev-066af983c74162fa98e7c5ffa8a5ead4a6979b1f.tar.gz | |
i2c-pxa: Support new-style I2C drivers
Signed-off-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 9 |
1 files changed, 8 insertions, 1 deletions
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; |
