Merge branch 'tracing/ftrace' into auto-ftrace-next

[pandora-kernel.git] / drivers / i2c / busses / i2c-gpio.c

diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index 025f194..7c1b762 100644 (file)
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -140,6 +140,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev)
        adap->owner = THIS_MODULE;
        snprintf(adap->name, sizeof(adap->name), "i2c-gpio%d", pdev->id);
        adap->algo_data = bit_data;
+       adap->class = I2C_CLASS_HWMON;
        adap->dev.parent = &pdev->dev;
 
        /*
@@ -147,7 +148,7 @@ static int __init i2c_gpio_probe(struct platform_device *pdev)
         * 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;
+       adap->nr = (pdev->id != -1) ? pdev->id : 0;
        ret = i2c_bit_add_numbered_bus(adap);
        if (ret)
                goto err_add_bus;
@@ -219,3 +220,4 @@ module_exit(i2c_gpio_exit);
 MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 MODULE_DESCRIPTION("Platform-independent bitbanging I2C driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:i2c-gpio");