diff options
author | Ben Dooks <ben-linux@fluff.org> | 2011-01-12 17:25:32 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-01-12 17:25:32 -0500 |
commit | adeaf46d311715deee9ae38ef1edb0d6b6fb0d55 (patch) | |
tree | 0fb18544cbc4d653375ed15ec5339534e58d69d7 /drivers | |
parent | 428dcc19374c9ebcf8fee057057c9023174c1b2a (diff) | |
parent | 6d779a4c3f97023fe329ef33aba25c8aaadf281b (diff) |
Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638
Diffstat (limited to 'drivers')
-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) | |||
872 | adap->owner = THIS_MODULE; | 872 | adap->owner = THIS_MODULE; |
873 | adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; | 873 | adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; |
874 | adap->algo = &nmk_i2c_algo; | 874 | adap->algo = &nmk_i2c_algo; |
875 | snprintf(adap->name, sizeof(adap->name), | ||
876 | "Nomadik I2C%d at %lx", pdev->id, (unsigned long)res->start); | ||
875 | 877 | ||
876 | /* fetch the controller id */ | 878 | /* fetch the controller id */ |
877 | adap->nr = pdev->id; | 879 | adap->nr = pdev->id; |
@@ -891,8 +893,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev) | |||
891 | goto err_init_hw; | 893 | goto err_init_hw; |
892 | } | 894 | } |
893 | 895 | ||
894 | dev_dbg(&pdev->dev, "initialize I2C%d bus on virtual " | 896 | dev_info(&pdev->dev, "initialize %s on virtual " |
895 | "base %p\n", pdev->id, dev->virtbase); | 897 | "base %p\n", adap->name, dev->virtbase); |
896 | 898 | ||
897 | ret = i2c_add_numbered_adapter(adap); | 899 | ret = i2c_add_numbered_adapter(adap); |
898 | if (ret) { | 900 | if (ret) { |