From aaf0c644949edcac951a76423a5b8aa799eebcd4 Mon Sep 17 00:00:00 2001
From: Rodolfo Giometti <giometti@enneenne.com>
Date: Thu, 12 Jul 2007 14:12:30 +0200
Subject: [PATCH] --- yaml --- r: 58821 b: refs/heads/master c:
 066af983c74162fa98e7c5ffa8a5ead4a6979b1f h: refs/heads/master i:   58819:
 a8eef5aa0af132380e77420006ec853d8f8790e9 v: v3

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

diff --git a/[refs] b/[refs]
index e5d7ef3a0691..651db12c5870 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d6ceed4426cd85e1203a3153246334a3537f92b
+refs/heads/master: 066af983c74162fa98e7c5ffa8a5ead4a6979b1f
diff --git a/trunk/drivers/i2c/busses/i2c-pxa.c b/trunk/drivers/i2c/busses/i2c-pxa.c
index 28e7b91a4553..9d6b790d4321 100644
--- a/trunk/drivers/i2c/busses/i2c-pxa.c
+++ b/trunk/drivers/i2c/busses/i2c-pxa.c
@@ -921,7 +921,14 @@ static int i2c_pxa_probe(struct platform_device *dev)
 		i2c->adap.class = plat->class;
 	}
 
-	ret = i2c_add_adapter(&i2c->adap);
+	/*
+	 * If "dev->id" is negative we consider it as zero.
+	 * 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;
+
+	ret = i2c_add_numbered_adapter(&i2c->adap);
 	if (ret < 0) {
 		printk(KERN_INFO "I2C: Failed to add bus\n");
 		goto eadapt;