diff options
| author | Linus Walleij <linus.walleij@stericsson.com> | 2010-11-30 16:59:29 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-01-04 01:17:55 +0000 |
| commit | 6d779a4c3f97023fe329ef33aba25c8aaadf281b (patch) | |
| tree | 4555e3e2d79e5cdb16de3230e3f167366ebf15d3 /drivers/i2c/busses/i2c-nomadik.c | |
| parent | 03ed6a3aa600c48593c3984812fda2d5945ddb46 (diff) | |
| download | op-kernel-dev-6d779a4c3f97023fe329ef33aba25c8aaadf281b.zip op-kernel-dev-6d779a4c3f97023fe329ef33aba25c8aaadf281b.tar.gz | |
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>
Diffstat (limited to 'drivers/i2c/busses/i2c-nomadik.c')
| -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 c9fffd0..f7148fd 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) { |
