From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 9 Mar 2010 00:39:49 +0000 (-0800)
Subject: .33 patch
X-Git-Tag: v2.6.32.10~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef1d911e850f036a6fe5cb86109e00b7db68db40;p=thirdparty%2Fkernel%2Fstable-queue.git

.33 patch
---

diff --git a/queue-2.6.33/rtc-core-fix-memory-leak.patch b/queue-2.6.33/rtc-core-fix-memory-leak.patch
new file mode 100644
index 00000000000..1aec24899fd
--- /dev/null
+++ b/queue-2.6.33/rtc-core-fix-memory-leak.patch
@@ -0,0 +1,32 @@
+From 2a7a06a0cdd86d572e91657603180da5992be6d3 Mon Sep 17 00:00:00 2001
+From: Aaro Koskinen <aaro.koskinen@nokia.com>
+Date: Fri, 5 Mar 2010 13:44:24 -0800
+Subject: rtc-core: fix memory leak
+
+From: Aaro Koskinen <aaro.koskinen@nokia.com>
+
+commit 2a7a06a0cdd86d572e91657603180da5992be6d3 upstream.
+
+The idr should be destroyed when the module is unloaded. Found with
+kmemleak.
+
+Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
+Cc: Alessandro Zummo <a.zummo@towertech.it>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/rtc/class.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/rtc/class.c
++++ b/drivers/rtc/class.c
+@@ -226,6 +226,7 @@ static void __exit rtc_exit(void)
+ {
+ 	rtc_dev_exit();
+ 	class_destroy(rtc_class);
++	idr_destroy(&rtc_idr);
+ }
+ 
+ subsys_initcall(rtc_init);
diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index 3c9e781ffb5..85f7b4e8974 100644
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -16,3 +16,4 @@ vfs-take-f_lock-on-modifying-f_mode-after-open-time.patch
 x86-uv-uv_global_gru_mmr_address-macro-fix.patch
 drm-i915-give-up-on-8xx-lid-status.patch
 ath9k-fix-keycache-leak-in-split-tkip-case.patch
+rtc-core-fix-memory-leak.patch