From e3952d3789f168ca9dbffbd377488433833f3651 Mon Sep 17 00:00:00 2001 From: Dale Farnsworth Date: Thu, 12 Jul 2007 14:12:29 +0200 Subject: [PATCH] --- yaml --- r: 58813 b: refs/heads/master c: 65b22ad9508b609b0625eccb2680996a1e09ed16 h: refs/heads/master i: 58811: 9603462455aecc82108492617162f0b106b722b5 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-mv64xxx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bfc060e839b4..20b05eeb4bd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c29c22218b99dad95f7cd0281415a854aeee805c +refs/heads/master: 65b22ad9508b609b0625eccb2680996a1e09ed16 diff --git a/trunk/drivers/i2c/busses/i2c-mv64xxx.c b/trunk/drivers/i2c/busses/i2c-mv64xxx.c index a55b3335d1be..251154ae5d97 100644 --- a/trunk/drivers/i2c/busses/i2c-mv64xxx.c +++ b/trunk/drivers/i2c/busses/i2c-mv64xxx.c @@ -527,6 +527,7 @@ mv64xxx_i2c_probe(struct platform_device *pd) drv_data->adapter.class = I2C_CLASS_HWMON; drv_data->adapter.timeout = pdata->timeout; drv_data->adapter.retries = pdata->retries; + drv_data->adapter.nr = pd->id; platform_set_drvdata(pd, drv_data); i2c_set_adapdata(&drv_data->adapter, drv_data); @@ -539,7 +540,7 @@ mv64xxx_i2c_probe(struct platform_device *pd) drv_data->irq); rc = -EINVAL; goto exit_unmap_regs; - } else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) { + } else if ((rc = i2c_add_numbered_adapter(&drv_data->adapter)) != 0) { dev_err(&drv_data->adapter.dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc); goto exit_free_irq;