diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 2cc4dda462794a3b2f304b0590880237511505b6..2cdbc247d0ac92ca2765ea906174dcbc7bacb890 100644
--- a/drivers/block/cciss.c
+++ b/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);
 }