From f1f53f389890a8d6b65e3460d47c0d1dd4d81900 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sat, 25 Nov 2006 11:09:30 -0800
Subject: [PATCH] --- yaml --- r: 41077 b: refs/heads/master c:
 82189b9807e05ea8d1f69de5bf92eaf244a0eb12 h: refs/heads/master i:   41075:
 e30a1a1e456eb6118a76997fee40360983acf0df v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/base/core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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);