diff --git a/[refs] b/[refs]
index ded3024ff7c6..1cf1b8544a49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceaeade1f94c0a1c0163906ceeaede6493a9715e
+refs/heads/master: fef6ec8dd96205fb22e3cfe2e4abd69d89413631
diff --git a/trunk/drivers/base/class.c b/trunk/drivers/base/class.c
index d207296b18dc..d164c32a97ad 100644
--- a/trunk/drivers/base/class.c
+++ b/trunk/drivers/base/class.c
@@ -299,10 +299,8 @@ static void class_dev_release(struct kobject * kobj)
 
 	pr_debug("device class '%s': release.\n", cd->class_id);
 
-	if (cd->devt_attr) {
-		kfree(cd->devt_attr);
-		cd->devt_attr = NULL;
-	}
+	kfree(cd->devt_attr);
+	cd->devt_attr = NULL;
 
 	if (cls->release)
 		cls->release(cd);