aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/BusLogic.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-06-17 19:42:23 -0400
committerJames Bottomley <jejb@titanic.(none)>2005-06-17 19:42:23 -0400
commit3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch)
tree4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/BusLogic.c
parent9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff)
parentdf0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff)
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/BusLogic.c')
-rw-r--r--drivers/scsi/BusLogic.c8
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)
2746 2746
2747 unsigned int id = SCpnt->device->id; 2747 unsigned int id = SCpnt->device->id;
2748 struct BusLogic_TargetStatistics *stats = &HostAdapter->TargetStatistics[id]; 2748 struct BusLogic_TargetStatistics *stats = &HostAdapter->TargetStatistics[id];
2749 int rc;
2750
2751 spin_lock_irq(SCpnt->device->host->host_lock);
2752
2749 BusLogic_IncrementErrorCounter(&stats->HostAdapterResetsRequested); 2753 BusLogic_IncrementErrorCounter(&stats->HostAdapterResetsRequested);
2750 2754
2751 return BusLogic_ResetHostAdapter(HostAdapter, false); 2755 rc = BusLogic_ResetHostAdapter(HostAdapter, false);
2756 spin_unlock_irq(SCpnt->device->host->host_lock);
2757 return rc;
2752} 2758}
2753 2759
2754/* 2760/*