From 43f924fae9ab2c7090cd86ace9024ea4d8eca322 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Thu, 12 Nov 2009 12:49:50 -0600 Subject: [PATCH] --- yaml --- r: 172955 b: refs/heads/master c: d06dfbd236795acbb67e22e51bb8af12e953ced3 h: refs/heads/master i: 172953: f1e8c178325e8ccdc1a3af1f94ff34d285dcd51d 172951: 3aaaadb956f56bcdbea6292aa38fff5a0ffdc2bc v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) 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); } }