diff options
| author |   Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> | 2010-01-16 20:43:13 +0100 |
|---|---|---|
| committer |   Jean Delvare <khali@linux-fr.org> | 2010-01-16 20:43:13 +0100 |
| commit | c556752109794a5ff199b80a1673336b4df8433a (patch) | |
| tree | c52e1517783c04a77eed0faad64f9bcd5799f0b7 | |
| parent | i2c/pca: Don't use *_interruptible (diff) | |
| download | linux-dev-c556752109794a5ff199b80a1673336b4df8433a.tar.xz linux-dev-c556752109794a5ff199b80a1673336b4df8433a.zip | |
i2c: Do not use device name after device_unregister
dev_dbg outputs dev_name, which is released with device_unregister. This bug
resulted in output like this:
i2c Xy2�0: adapter [SMBus I801 adapter at 1880] unregistered
The right output would be:
i2c i2c-0: adapter [SMBus I801 adapter at 1880] unregistered
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
| -rw-r--r-- | drivers/i2c/i2c-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index d610e995bbfd..10be7b5fbe97 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -843,6 +843,9 @@ int i2c_del_adapter(struct i2c_adapter *adap) adap->dev.parent); #endif + /* device name is gone after device_unregister */ + dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name); + /* clean up the sysfs representation */ init_completion(&adap->dev_released); device_unregister(&adap->dev); @@ -855,8 +858,6 @@ int i2c_del_adapter(struct i2c_adapter *adap) idr_remove(&i2c_adapter_idr, adap->nr); mutex_unlock(&core_lock); - dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name); - /* Clear the device structure in case this adapter is ever going to be added again */ memset(&adap->dev, 0, sizeof(adap->dev)); |