Use i2c_bit_add_numbered_bus() if device id specified, so that the
i2c-gpio adapter works well with new-style pre-declared devices.

Signed-off-by: Atsushi Nemoto <[EMAIL PROTECTED]>
---
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index a7dd546..8a62c26 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -142,7 +142,10 @@ 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 (pdev->id == -1)
+               ret = i2c_bit_add_bus(adap);
+       else
+               ret = i2c_bit_add_numbered_bus(adap);
        if (ret)
                goto err_add_bus;
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to