summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mvme147.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-06-17 19:04:18 -0500
committerJames Bottomley <jejb@titanic.(none)>2005-06-17 19:04:18 -0500
commit3afa294c40013be5d8180005002e3f648d04d942 (patch)
tree8a8b7464fd8ee4901288afb3e9e8d761ef45647d /drivers/scsi/mvme147.c
parenta1541d5af66d02426655b1498f814c52347dd7d3 (diff)
parent3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff)
downloadblackbird-op-linux-3afa294c40013be5d8180005002e3f648d04d942.tar.gz
blackbird-op-linux-3afa294c40013be5d8180005002e3f648d04d942.zip
merge by hand (qla_os.c mismerge)
Diffstat (limited to 'drivers/scsi/mvme147.c')
-rw-r--r--drivers/scsi/mvme147.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index e73b33f293a0..2fb31ee6d9f5 100644
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -116,7 +116,14 @@ int mvme147_detect(Scsi_Host_Template *tpnt)
static int mvme147_bus_reset(Scsi_Cmnd *cmd)
{
/* FIXME perform bus-specific reset */
+
+ /* FIXME 2: kill this function, and let midlayer fallback to
+ the same result, calling wd33c93_host_reset() */
+
+ spin_lock_irq(cmd->device->host->host_lock);
wd33c93_host_reset(cmd);
+ spin_unlock_irq(cmd->device->host->host_lock);
+
return SUCCESS;
}
OpenPOWER on IntegriCloud