Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41077
b: refs/heads/master
c: 82189b9
h: refs/heads/master
i:
  41075: e30a1a1
v: v3
  • Loading branch information
Catalin Marinas authored and Linus Torvalds committed Nov 25, 2006
1 parent f464966 commit f1f53f3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 533221fbaf001692d5db646f84f7d033fac78cc7
refs/heads/master: 82189b9807e05ea8d1f69de5bf92eaf244a0eb12
4 changes: 3 additions & 1 deletion trunk/drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,10 @@ void device_del(struct device * dev)

if (parent)
klist_del(&dev->knode_parent);
if (dev->devt_attr)
if (dev->devt_attr) {
device_remove_file(dev, dev->devt_attr);
kfree(dev->devt_attr);
}
if (dev->class) {
sysfs_remove_link(&dev->kobj, "subsystem");
sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);
Expand Down

0 comments on commit f1f53f3

Please sign in to comment.