Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179395
b: refs/heads/master
c: c556752
h: refs/heads/master
i:
  179393: 2ec59b3
  179391: 43a1d6f
v: v3
  • Loading branch information
Thadeu Lima de Souza Cascardo authored and Jean Delvare committed Jan 16, 2010
1 parent 680dd91 commit b90daef
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 22f8b2695eda496026623020811cae34590ee3d7
refs/heads/master: c556752109794a5ff199b80a1673336b4df8433a
5 changes: 3 additions & 2 deletions trunk/drivers/i2c/i2c-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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));
Expand Down

0 comments on commit b90daef

Please sign in to comment.