i2c-mv64xxxx: allow more than one driver instance
authorFlorian Fainelli <ffainelli@freebox.fr>
Sun, 8 Jul 2012 15:53:05 +0000 (17:53 +0200)
committerWolfram Sang <w.sang@pengutronix.de>
Thu, 12 Jul 2012 13:50:51 +0000 (15:50 +0200)
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>
drivers/i2c/busses/i2c-mv64xxx.c

index 4f44a33017b061db314e051f9df882d4dee6a9e0..6e70eea0cd2f99d310547a5102f4d79f37b5ee0f 100644 (file)
@@ -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);