diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/a3000.c | |
parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
download | kernel_samsung_aries-3237ee78fc00f786d5f5aec6f9310b0e39069f15.zip kernel_samsung_aries-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.gz kernel_samsung_aries-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.bz2 |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/a3000.c')
-rw-r--r-- | drivers/scsi/a3000.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index f8a89ec..306caf5 100644 --- a/drivers/scsi/a3000.c +++ b/drivers/scsi/a3000.c @@ -208,7 +208,14 @@ fail_register: static int a3000_bus_reset(Scsi_Cmnd *cmd) { /* FIXME perform bus-specific reset */ + + /* FIXME 2: kill this entire function, which should + cause mid-layer to call wd33c93_host_reset anyway? */ + + spin_lock_irq(cmd->device->host->host_lock); wd33c93_host_reset(cmd); + spin_unlock_irq(cmd->device->host->host_lock); + return SUCCESS; } |