diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 17:42:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-10 17:42:39 -0400 |
| commit | f3f94ce5dba6e134cf0958dd3a42ab28a028fc83 (patch) | |
| tree | 4539d11ddc93f000c96e3a21976cf4b4fe6742d1 /drivers/i2c/busses/i2c-gpio.c | |
| parent | 5d9adefc1e7218d060a88416943dd18e86c3c975 (diff) | |
| parent | 939bc4943d0483961edc45b63a7d27b4ffe547e3 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-algo-bit: Read block data bugfix
i2c-pxa: Fix adapter number
i2c-gpio: Fix adapter number
Diffstat (limited to 'drivers/i2c/busses/i2c-gpio.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 025f19423faf..44e1cd21bb01 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c | |||
| @@ -147,7 +147,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev) | |||
| 147 | * The reason to do so is to avoid sysfs names that only make | 147 | * The reason to do so is to avoid sysfs names that only make |
| 148 | * sense when there are multiple adapters. | 148 | * sense when there are multiple adapters. |
| 149 | */ | 149 | */ |
| 150 | adap->nr = pdev->id >= 0 ? pdev->id : 0; | 150 | adap->nr = (pdev->id != -1) ? pdev->id : 0; |
| 151 | ret = i2c_bit_add_numbered_bus(adap); | 151 | ret = i2c_bit_add_numbered_bus(adap); |
| 152 | if (ret) | 152 | if (ret) |
| 153 | goto err_add_bus; | 153 | goto err_add_bus; |