From 2a93d9129b26586862f924c1e25547ecb91bf00b Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Mon, 8 Nov 2010 14:29:13 +0100
Subject: [PATCH] --- yaml --- r: 221825 b: refs/heads/master c:
 90fdb0b98a62d78a0650b9fd3ddc58a48f71d740 h: refs/heads/master i:   221823:
 de404f0e3e17f35e95aae652c47d0c3fe4547feb v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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);
 }