summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorFlorian Fainelli <ffainelli@freebox.fr>2012-07-08 17:53:05 +0200
committerWolfram Sang <w.sang@pengutronix.de>2012-07-12 15:50:51 +0200
commitd61a9095155e832287552a9e565b8756ee293c46 (patch)
tree9c15aed4697d4ff505febe5f22b059fbcb08bd52 /drivers/i2c
parentf518b482c89b3ff51804f09c14b1cedbef811b84 (diff)
downloadop-kernel-dev-d61a9095155e832287552a9e565b8756ee293c46.zip
op-kernel-dev-d61a9095155e832287552a9e565b8756ee293c46.tar.gz
i2c-mv64xxxx: allow more than one driver instance
The driver currently checks the platform device id and rejects platform device id different from 0. This prevents the registration of a second i2c controller on systems where a second one might be available (such as Kirkwood 88F6282). CC: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Schichan <nschichan@freebox.fr> Signed-off-by: Florian Fainelli <ffainelli@freebox.fr> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 4f44a33..6e70eea 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -528,7 +528,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
struct mv64xxx_i2c_pdata *pdata = pd->dev.platform_data;
int rc;
- if ((pd->id != 0) || !pdata)
+ if (!pdata)
return -ENODEV;
drv_data = kzalloc(sizeof(struct mv64xxx_i2c_data), GFP_KERNEL);
OpenPOWER on IntegriCloud