Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 6 insertions, 11 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 51ce268998cd..4fd4f52c8e9b 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -156,7 +156,7 @@ int i2c_add_adapter(struct i2c_adapter *adap)
                 goto out_unlock;
         }
 
-        res = idr_get_new(&i2c_adapter_idr, NULL, &id);
+        res = idr_get_new(&i2c_adapter_idr, adap, &id);
         if (res < 0) {
                 if (res == -EAGAIN)
                         res = -ENOMEM;
@@ -765,20 +765,15 @@ int i2c_adapter_id(struct i2c_adapter *adap)
 
 struct i2c_adapter* i2c_get_adapter(int id)
 {
-        struct list_head   *item;
         struct i2c_adapter *adapter;
         
         down(&core_lists);
-        list_for_each(item,&adapters) {
-                adapter = list_entry(item, struct i2c_adapter, list);
-                if (id == adapter->nr &&
-                    try_module_get(adapter->owner)) {
-                        up(&core_lists);
-                        return adapter;
-                }
-        }
+        adapter = (struct i2c_adapter *)idr_find(&i2c_adapter_idr, id);
+        if (adapter && !try_module_get(adapter->owner))
+                adapter = NULL;
+
         up(&core_lists);
-        return NULL;
+        return adapter;
 }
 
 void i2c_put_adapter(struct i2c_adapter *adap)