summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Dooks <ben.dooks@codethink.co.uk>2012-06-26 09:56:33 +0100
committerBen Dooks <ben.dooks@codethink.co.uk>2012-11-02 15:04:34 +0000
commit872c8cd173d429e614dae48c60f5a7da1969f9d9 (patch)
tree14e19eddc6ac81a7c2d2c7d40005d8b0124c3780
parent3101d749213ffa86d3500e850bbf3628ba45efe1 (diff)
downloadlinux-872c8cd173d429e614dae48c60f5a7da1969f9d9.tar.gz
i2c-mv64xxxx: Remove dependency on dev.id == 0
The i2c-mv64xxxx driver should be able to cope with more than one i2c bus, as found on devices such as the 88F6282. Remove the test for pdev.id so that i2c-1 can be attached. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
-rw-r--r--drivers/i2c/busses/i2c-mv64xxx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 2e9d56719e99..2738dad92f9b 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -612,6 +612,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
struct mv64xxx_i2c_pdata *pdata = pd->dev.platform_data;
int rc;
+
if ((!pdata && !pd->dev.of_node))
return -ENODEV;