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