From 51b1aa6a37b3a30c410ba7a2df339a98a49b0d09 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 9 Sep 2007 22:29:13 +0200
Subject: [PATCH] --- yaml --- r: 64751 b: refs/heads/master c:
 51e5709ad46127da9476f31336113b5401f94dba h: refs/heads/master i:   64749:
 c6c9613ae707065eb34ca6aa5b1853e9cd11248f   64747:
 7e8d0d89633eef8f70bea26f4d2a0e4abd3db310   64743:
 5a452ed9dcdd63b16a6b3de2f02118099cff59fc   64735:
 abe8195ac2f45212b60ea02c32fbfbb34806faf0 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/i2c/busses/i2c-pxa.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e75e69213028..df774d31a22f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a3180e70e35ff69586ada5421b5e7bad52f60e4
+refs/heads/master: 51e5709ad46127da9476f31336113b5401f94dba
diff --git a/trunk/drivers/i2c/busses/i2c-pxa.c b/trunk/drivers/i2c/busses/i2c-pxa.c
index 9d6b790d4321..bb5466b27b59 100644
--- a/trunk/drivers/i2c/busses/i2c-pxa.c
+++ b/trunk/drivers/i2c/busses/i2c-pxa.c
@@ -926,7 +926,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
 	 * The reason to do so is to avoid sysfs names that only make
 	 * sense when there are multiple adapters.
 	 */
-	i2c->adap.nr = dev->id >= 0 ? dev->id : 0;
+	i2c->adap.nr = dev->id != -1 ? dev->id : 0;
 
 	ret = i2c_add_numbered_adapter(&i2c->adap);
 	if (ret < 0) {