[SCSI] hpsa: do not sleep in atomic context in rmmod path.

Don't call kthread_stop with a spin lock held and interrupts
disabled because kthread_stop will sleep waiting for the thread
to stop.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 5140f5d0fd6..b96962c3944 100644
--- a/drivers/scsi/hpsa.c
+++ b/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);