diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
| commit | 22648cbcf5efd94c2632b3fe8c5c90ae54df928d (patch) | |
| tree | 56a49fcd9a974d61f1a4e224f23efe9b4fd1b438 /drivers/i2c/busses/i2c-s6000.c | |
| parent | db9431f0e697b132a7b6aca9c946f85851af5a39 (diff) | |
| parent | 5049b88232de6414144f4cf0f4510227afd0098e (diff) | |
Merge branch 'devicetree/linaro-3.0' of git://git.secretlab.ca/git/linux-2.6 into linaro-3.0
Diffstat (limited to 'drivers/i2c/busses/i2c-s6000.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s6000.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c index cb5d01e279c..c64ba736f48 100644 --- a/drivers/i2c/busses/i2c-s6000.c +++ b/drivers/i2c/busses/i2c-s6000.c @@ -341,10 +341,7 @@ static int __devinit s6i2c_probe(struct platform_device *dev) i2c_wr16(iface, S6_I2C_TXTL, 0); platform_set_drvdata(dev, iface); - if (bus_num < 0) - rc = i2c_add_adapter(p_adap); - else - rc = i2c_add_numbered_adapter(p_adap); + rc = i2c_add_numbered_adapter(p_adap); if (rc) goto err_irq_free; return 0; |