i2c-nomadik: fix regression on adapter name

The Nomadik I2C adapter does not provide a name for the struct
passed into i2c_add_numbered_adapter() causing a regression on
2.6.37-rc3 due to commit 2236baa75f704851d3cd3310569058151acb1f06
adding sanity checks for adapters. Fix this by providing a name
proper.

Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index c9fffd0389fe39eac24731e60732658f32b98ec6..f7148fdd46e072e37b040652ab59313e6c79eda3 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -872,6 +872,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
        adap->owner     = THIS_MODULE;
        adap->class     = I2C_CLASS_HWMON | I2C_CLASS_SPD;
        adap->algo      = &nmk_i2c_algo;
+       snprintf(adap->name, sizeof(adap->name),
+                "Nomadik I2C%d at %lx", pdev->id, (unsigned long)res->start);
 
        /* fetch the controller id */
        adap->nr        = pdev->id;
@@ -891,8 +893,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
                goto err_init_hw;
        }
 
-       dev_dbg(&pdev->dev, "initialize I2C%d bus on virtual "
-               "base %p\n", pdev->id, dev->virtbase);
+       dev_info(&pdev->dev, "initialize %s on virtual "
+               "base %p\n", adap->name, dev->virtbase);
 
        ret = i2c_add_numbered_adapter(adap);
        if (ret) {