aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/initio.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-06-20 12:35:34 -0400
committerTony Luck <tony.luck@intel.com>2005-06-20 12:35:34 -0400
commit8ba08378b479f472b37b83542c31bdad465033cf (patch)
treef4421227b3065e786c9041cf0ce0073a249e011b /drivers/scsi/initio.c
parent34b727c135ff651f153be5757056d25678b6d018 (diff)
parent8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff)
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/scsi/initio.c')
-rw-r--r--drivers/scsi/initio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index a7b74d8c53b9..f7ddc9f1ba41 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -3014,7 +3014,11 @@ static int i91u_bus_reset(struct scsi_cmnd * SCpnt)
3014 HCS *pHCB; 3014 HCS *pHCB;
3015 3015
3016 pHCB = (HCS *) SCpnt->device->host->base; 3016 pHCB = (HCS *) SCpnt->device->host->base;
3017
3018 spin_lock_irq(SCpnt->device->host->host_lock);
3017 tul_reset_scsi(pHCB, 0); 3019 tul_reset_scsi(pHCB, 0);
3020 spin_unlock_irq(SCpnt->device->host->host_lock);
3021
3018 return SUCCESS; 3022 return SUCCESS;
3019} 3023}
3020 3024