From b90daefd3ab41f55ed688675fed9f1b4cf33d792 Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Sat, 16 Jan 2010 20:43:13 +0100 Subject: [PATCH] --- yaml --- r: 179395 b: refs/heads/master c: c556752109794a5ff199b80a1673336b4df8433a h: refs/heads/master i: 179393: 2ec59b3da5b9f35193ea7aeb5765d3532a944a85 179391: 43a1d6f0d1b61c13a5ee2e9d3d4fec3d20d6d4de v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6e16a3c4ca6c..1d067887896d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22f8b2695eda496026623020811cae34590ee3d7 +refs/heads/master: c556752109794a5ff199b80a1673336b4df8433a diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c index d610e995bbfd..10be7b5fbe97 100644 --- a/trunk/drivers/i2c/i2c-core.c +++ b/trunk/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));