From 2789a1cbef49469f3801c61e8991b5163487df95 Mon Sep 17 00:00:00 2001
From: Devendra Naga <devendra.aaru@gmail.com>
Date: Thu, 13 Sep 2012 13:08:48 -0400
Subject: [PATCH] --- yaml --- r: 325261 b: refs/heads/master c:
 99d4b1a6cbfa8449dad5fb58e8c8044301e2667a h: refs/heads/master i:   325259:
 3d7135981b41ae777cc9bae08e555dbb3fd89f11 v: v3

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

diff --git a/[refs] b/[refs]
index c6d54fa8d817..5afd3a5e27fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43bf2f4bfeb57601a9ccba382e0f378763df4b26
+refs/heads/master: 99d4b1a6cbfa8449dad5fb58e8c8044301e2667a
diff --git a/trunk/drivers/staging/ccg/ccg.c b/trunk/drivers/staging/ccg/ccg.c
index 81ac6bbba55f..565249b2d755 100644
--- a/trunk/drivers/staging/ccg/ccg.c
+++ b/trunk/drivers/staging/ccg/ccg.c
@@ -1254,8 +1254,10 @@ static int __init init(void)
 		return PTR_ERR(ccg_class);
 
 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-	if (!dev)
+	if (!dev) {
+		class_destroy(ccg_class);
 		return -ENOMEM;
+	}
 
 	dev->functions = supported_functions;
 	INIT_LIST_HEAD(&dev->enabled_functions);