|
@@ -156,7 +156,7 @@ int i2c_add_adapter(struct i2c_adapter *adap)
|
|
goto out_unlock;
|
|
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 < 0) {
|
|
if (res == -EAGAIN)
|
|
if (res == -EAGAIN)
|
|
res = -ENOMEM;
|
|
res = -ENOMEM;
|
|
@@ -765,20 +765,15 @@ int i2c_adapter_id(struct i2c_adapter *adap)
|
|
|
|
|
|
struct i2c_adapter* i2c_get_adapter(int id)
|
|
struct i2c_adapter* i2c_get_adapter(int id)
|
|
{
|
|
{
|
|
- struct list_head *item;
|
|
|
|
struct i2c_adapter *adapter;
|
|
struct i2c_adapter *adapter;
|
|
|
|
|
|
down(&core_lists);
|
|
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);
|
|
up(&core_lists);
|
|
- return NULL;
|
|
|
|
|
|
+ return adapter;
|
|
}
|
|
}
|
|
|
|
|
|
void i2c_put_adapter(struct i2c_adapter *adap)
|
|
void i2c_put_adapter(struct i2c_adapter *adap)
|