Merge tag 'rpmsg-3.6-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg

[~andy/linux] / drivers / i2c / busses / i2c-pca-platform.c

diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 2adbf1a8fdea0019d8ca3acae29790ca18722552..675878f49f76a2ad1c1235068c775abfc583ef0e 100644 (file)
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -171,7 +171,7 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
        i2c->io_size = resource_size(res);
        i2c->irq = irq;
 
-       i2c->adap.nr = pdev->id >= 0 ? pdev->id : 0;
+       i2c->adap.nr = pdev->id;
        i2c->adap.owner = THIS_MODULE;
        snprintf(i2c->adap.name, sizeof(i2c->adap.name),
                 "PCA9564/PCA9665 at 0x%08lx",