diff --git a/[refs] b/[refs]
index 1feafcc24eed..8751bdc03eb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0e15f6db1110319cb2e747e59e1200450a5ba3e
+refs/heads/master: d06dfbd236795acbb67e22e51bb8af12e953ced3
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 23c2910aa7bb..42eaddb54380 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -3386,13 +3386,11 @@ static int scan_thread(void *data)
 			h->busy_scanning = 1;
 			mutex_unlock(&scan_mutex);
 
-			if (h) {
-				rebuild_lun_table(h, 0, 0);
-				complete_all(&h->scan_wait);
-				mutex_lock(&scan_mutex);
-				h->busy_scanning = 0;
-				mutex_unlock(&scan_mutex);
-			}
+			rebuild_lun_table(h, 0, 0);
+			complete_all(&h->scan_wait);
+			mutex_lock(&scan_mutex);
+			h->busy_scanning = 0;
+			mutex_unlock(&scan_mutex);
 		}
 	}