diff options
| author | David Brownell <david-b@pacbell.net> | 2007-09-09 16:29:13 -0400 |
|---|---|---|
| committer | Jean Delvare <khali@hyperion.delvare> | 2007-09-09 16:29:13 -0400 |
| commit | 9a3180e70e35ff69586ada5421b5e7bad52f60e4 (patch) | |
| tree | 68f47d75fb3788c077d8da8ef75caf90a1c37815 /drivers/i2c | |
| parent | b21010ed6498391c0f359f2a89c907533fe07fec (diff) | |
i2c-gpio: Fix adapter number
It turns out that platform_device.id is a "u32" so testing it for being
nonnegative is useless when setting up an i2c bitbang device. Instead,
do what the platform_bus code does and test it against the value "-1".
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-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 | 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; |