diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-01-12 23:25:32 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-01-12 23:25:32 +0100 |
| commit | adeaf46d311715deee9ae38ef1edb0d6b6fb0d55 (patch) | |
| tree | 0fb18544cbc4d653375ed15ec5339534e58d69d7 /drivers/i2c | |
| parent | Merge branch 'for-2638/i2c/intel' into for-linus/i2c-2638 (diff) | |
| parent | i2c-nomadik: fix regression on adapter name (diff) | |
| download | linux-adeaf46d311715deee9ae38ef1edb0d6b6fb0d55.tar.xz linux-adeaf46d311715deee9ae38ef1edb0d6b6fb0d55.zip | |
Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-nomadik.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index c9fffd0389fe..f7148fdd46e0 100644 --- 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) { |