diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 8f1fc2dc355c20728e5ba568c8316e54114c9b5a..824252c703666e53ee70d9cf64f4d63a53ab2ac7 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2776,8 +2776,10 @@ static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent,
 		return -ENOMEM;
 
 	retval = sysfs_create_group(hstate_kobjs[hi], hstate_attr_group);
-	if (retval)
+	if (retval) {
 		kobject_put(hstate_kobjs[hi]);
+		hstate_kobjs[hi] = NULL;
+	}
 
 	return retval;
 }