diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-07-12 14:12:30 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@hyperion.delvare> | 2007-07-12 14:12:30 +0200 |
| commit | 7e69c3ac93a9a7aa29dab7179f86da67db7b0ca3 (patch) | |
| tree | 6c8fdbc48ed4a0a3ee30278e0557562b7b1c8fea /drivers/i2c | |
| parent | 757ba4c697244da878b65585d8cb671da1cb9eaf (diff) | |
| download | op-kernel-dev-7e69c3ac93a9a7aa29dab7179f86da67db7b0ca3.zip op-kernel-dev-7e69c3ac93a9a7aa29dab7179f86da67db7b0ca3.tar.gz | |
i2c-gpio: Add support for new-style clients
Use i2c_bit_add_numbered_bus() so that the i2c-gpio adapter works well
with new-style pre-declared devices.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-gpio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index a7dd546..d6dbd6a 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -142,7 +142,13 @@ static int __init i2c_gpio_probe(struct platform_device *pdev) adap->algo_data = bit_data; adap->dev.parent = &pdev->dev; - ret = i2c_bit_add_bus(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. + */ + adap->nr = pdev->id >= 0 ? pdev->id : 0; + ret = i2c_bit_add_numbered_bus(adap); if (ret) goto err_add_bus; |
