diff --git a/[refs] b/[refs]
index b61faec049af..2ef8baeaf934 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb4644cac4a2797afc847e6c92736664d4b0ea34
+refs/heads/master: 90fdb0b98a62d78a0650b9fd3ddc58a48f71d740
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 2cc4dda46279..2cdbc247d0ac 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -4936,7 +4936,8 @@ static void __exit cciss_cleanup(void)
 		}
 	}
 	kthread_stop(cciss_scan_thread);
-	remove_proc_entry("driver/cciss", NULL);
+	if (proc_cciss)
+		remove_proc_entry("driver/cciss", NULL);
 	bus_unregister(&cciss_bus_type);
 }