diff --git a/[refs] b/[refs]
index 2de1136957fa..dc99f7c8d1d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70655c06bd3f25111312d63985888112aed15ac5
+refs/heads/master: 6e191f7bb083544dc4fa3879ff81caf97c65d197
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index 1f3215ac085b..47c8452f485f 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -908,6 +908,9 @@ static int __init chr_dev_init(void)
 		printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 
 	mem_class = class_create(THIS_MODULE, "mem");
+	if (IS_ERR(mem_class))
+		return PTR_ERR(mem_class);
+
 	mem_class->devnode = mem_devnode;
 	for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) {
 		if (!devlist[minor].name)