From a8eef5aa0af132380e77420006ec853d8f8790e9 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Thu, 12 Jul 2007 14:12:30 +0200 Subject: [PATCH] --- yaml --- r: 58819 b: refs/heads/master c: 7e69c3ac93a9a7aa29dab7179f86da67db7b0ca3 h: refs/heads/master i: 58817: 6effeeca5a6902ab49b7cfff8a3fe41c718d3d43 58815: 9db888cc731182c4c557892d14e6d561ae48523e v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-gpio.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2939cedf8b14..330e79ed23a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 757ba4c697244da878b65585d8cb671da1cb9eaf +refs/heads/master: 7e69c3ac93a9a7aa29dab7179f86da67db7b0ca3 diff --git a/trunk/drivers/i2c/busses/i2c-gpio.c b/trunk/drivers/i2c/busses/i2c-gpio.c index a7dd54654a9a..d6dbd6ace21d 100644 --- a/trunk/drivers/i2c/busses/i2c-gpio.c +++ b/trunk/drivers/i2c/busses/i2c-gpio.c @@ -142,7 +142,13 @@ static int __init i2c_gpio_probe(struct platform_device *pdev) adap->algo_data = bit_data; adap->dev.parent = &pdev->dev; - ret = i2c_bit_add_bus(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. + */ + adap->nr = pdev->id >= 0 ? pdev->id : 0; + ret = i2c_bit_add_numbered_bus(adap); if (ret) goto err_add_bus;