iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638

Browse Source
This commit is contained in:
Ben Dooks 2011-01-12 22:25:32 +00:00
commit adeaf46d31
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/i2c/busses/i2c-nomadik.c
View File

@ -872,6 +872,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
adap->owner = THIS_MODULE; adap->owner = THIS_MODULE;
adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
adap->algo = &nmk_i2c_algo; 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 */ /* fetch the controller id */
adap->nr = pdev->id; adap->nr = pdev->id;
@ -891,8 +893,8 @@ static int __devinit nmk_i2c_probe(struct platform_device *pdev)
goto err_init_hw; goto err_init_hw;
} }
dev_dbg(&pdev->dev, "initialize I2C%d bus on virtual " dev_info(&pdev->dev, "initialize %s on virtual "
"base %p\n", pdev->id, dev->virtbase); "base %p\n", adap->name, dev->virtbase);
ret = i2c_add_numbered_adapter(adap); ret = i2c_add_numbered_adapter(adap);
if (ret) { if (ret) {