From 080b5475e73e021b0f090d15ed9480a6314f4dd1 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Thu, 5 Jan 2012 10:15:31 -0600 Subject: [PATCH] --- yaml --- r: 286340 b: refs/heads/master c: 775bf2773858c50d2acfcdf71889984be94e7037 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6485104e761f..38a8c4aea553 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2d7e40e8069f0d6b4958dbda4383f412f53c7d1 +refs/heads/master: 775bf2773858c50d2acfcdf71889984be94e7037 diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 5140f5d0fd6b..b96962c39449 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -4271,7 +4271,9 @@ static void stop_controller_lockup_detector(struct ctlr_info *h) remove_ctlr_from_lockup_detector_list(h); /* If the list of ctlr's to monitor is empty, stop the thread */ if (list_empty(&hpsa_ctlr_list)) { + spin_unlock_irqrestore(&lockup_detector_lock, flags); kthread_stop(hpsa_lockup_detector); + spin_lock_irqsave(&lockup_detector_lock, flags); hpsa_lockup_detector = NULL; } spin_unlock_irqrestore(&lockup_detector_lock, flags);