summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>1999-03-28 22:03:20 +0000
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>1999-03-28 22:03:20 +0000
commit5bc48dda552ceed7f0e97f14a2cb12f229489816 (patch)
tree7c78f70377eb219e0f94ea3ead3652c5ca7ed875 /drivers/scsi
parent3f108a94024ddc7545500d616561830196e06b72 (diff)
fix for the lockups after scsi aborts.
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/sgiwd93.c3
-rw-r--r--drivers/scsi/wd33c93.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index db8e0bb17..05ea49782 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -5,7 +5,7 @@
*
* (In all truth, Jed Schimmel wrote all this code.)
*
- * $Id: sgiwd93.c,v 1.10 1999/03/24 00:04:11 tsbogend Exp $
+ * $Id: sgiwd93.c,v 1.11 1999/03/25 22:41:20 tsbogend Exp $
*/
#include <linux/init.h>
#include <linux/types.h>
@@ -266,6 +266,7 @@ __initfunc(int sgiwd93_detect(Scsi_Host_Template *HPsUX))
sgiwd93_host = scsi_register(HPsUX, sizeof(struct WD33C93_hostdata));
sgiwd93_host->base = (unsigned char *) hregs;
+ sgiwd93_host->irq = 1;
buf = (uchar *) get_free_page(GFP_KERNEL);
init_hpc_chain(buf);
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 851ca7639..16fe5e022 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1455,6 +1455,8 @@ Scsi_Cmnd *tmp, *prev;
if (tmp == cmd) {
if (prev)
prev->host_scribble = cmd->host_scribble;
+ else
+ hostdata->input_Q = (Scsi_Cmnd *)cmd->host_scribble;
cmd->host_scribble = NULL;
cmd->result = DID_ABORT << 16;
printk("scsi%d: Abort - removing command %ld from input_Q. ",