diff --git a/[refs] b/[refs]
index 3cc579e1c5ef..518e5fff58fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62239ac2b301abc397e70986649666cfb7835907
+refs/heads/master: 294462a5c6c4fb9a6ced9cb5a368ff335f1b656e
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index b321cadd6e65..7f71b2c472b8 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -120,9 +120,10 @@ int unregister_blkdev(unsigned int major, const char *name)
 	for (n = &major_names[index]; *n; n = &(*n)->next)
 		if ((*n)->major == major)
 			break;
-	if (!*n || strcmp((*n)->name, name))
+	if (!*n || strcmp((*n)->name, name)) {
+		WARN_ON(1);
 		ret = -EINVAL;
-	else {
+	} else {
 		p = *n;
 		*n = p->next;
 	}