Merge with /home/shaggy/git/linus-clean/

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index bf4a758e2801..fb54a87a80a3 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -1586,9 +1586,16 @@ static int wd7000_host_reset(struct scsi_cmnd *SCpnt)
 {
         Adapter *host = (Adapter *) SCpnt->device->host->hostdata;
 
-        if (wd7000_adapter_reset(host) < 0)
+        spin_unlock_irq(SCpnt->device->host->host_lock);
+
+        if (wd7000_adapter_reset(host) < 0) {
+                spin_unlock_irq(SCpnt->device->host->host_lock);
                 return FAILED;
+        }
+
         wd7000_enable_intr(host);
+
+        spin_unlock_irq(SCpnt->device->host->host_lock);
         return SUCCESS;
 }