Merge /spare/repo/linux-2.6/

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 15e4b122d56e..9d6040bfa064 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -2746,9 +2746,15 @@ static int BusLogic_host_reset(struct scsi_cmnd * SCpnt)
 
         unsigned int id = SCpnt->device->id;
         struct BusLogic_TargetStatistics *stats = &HostAdapter->TargetStatistics[id];
+        int rc;
+
+        spin_lock_irq(SCpnt->device->host->host_lock);
+
         BusLogic_IncrementErrorCounter(&stats->HostAdapterResetsRequested);
 
-        return BusLogic_ResetHostAdapter(HostAdapter, false);
+        rc = BusLogic_ResetHostAdapter(HostAdapter, false);
+        spin_unlock_irq(SCpnt->device->host->host_lock);
+        return rc;
 }
 
 /*