diff --git a/[refs] b/[refs] index d7a677d6cf8d..0e0d9a41f80f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 533221fbaf001692d5db646f84f7d033fac78cc7 +refs/heads/master: 82189b9807e05ea8d1f69de5bf92eaf244a0eb12 diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index 68ad11af22b4..002fde46d38d 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/drivers/base/core.c @@ -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);