|
@@ -2413,9 +2413,15 @@ struct i2c_adapter *i2c_get_adapter(int nr)
|
|
|
|
|
|
mutex_lock(&core_lock);
|
|
mutex_lock(&core_lock);
|
|
adapter = idr_find(&i2c_adapter_idr, nr);
|
|
adapter = idr_find(&i2c_adapter_idr, nr);
|
|
- if (adapter && !try_module_get(adapter->owner))
|
|
|
|
|
|
+ if (!adapter)
|
|
|
|
+ goto exit;
|
|
|
|
+
|
|
|
|
+ if (try_module_get(adapter->owner))
|
|
|
|
+ get_device(&adapter->dev);
|
|
|
|
+ else
|
|
adapter = NULL;
|
|
adapter = NULL;
|
|
|
|
|
|
|
|
+ exit:
|
|
mutex_unlock(&core_lock);
|
|
mutex_unlock(&core_lock);
|
|
return adapter;
|
|
return adapter;
|
|
}
|
|
}
|
|
@@ -2423,8 +2429,11 @@ EXPORT_SYMBOL(i2c_get_adapter);
|
|
|
|
|
|
void i2c_put_adapter(struct i2c_adapter *adap)
|
|
void i2c_put_adapter(struct i2c_adapter *adap)
|
|
{
|
|
{
|
|
- if (adap)
|
|
|
|
- module_put(adap->owner);
|
|
|
|
|
|
+ if (!adap)
|
|
|
|
+ return;
|
|
|
|
+
|
|
|
|
+ put_device(&adap->dev);
|
|
|
|
+ module_put(adap->owner);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(i2c_put_adapter);
|
|
EXPORT_SYMBOL(i2c_put_adapter);
|
|
|
|
|