diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 12:50:08 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-27 12:50:08 -0500 |
commit | 6de7dc2c4c713d037c19aa1e310d240f16973414 (patch) | |
tree | 68963db8081e6ef18affd06cf2e9b00578ef874e /drivers/scsi/eata.c | |
parent | cbc3d65ebcb0c494183d45cf202a53352cbf3871 (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'drivers/scsi/eata.c')
-rw-r--r-- | drivers/scsi/eata.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 1bb8727eea3..c10e45b94b6 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c @@ -1899,16 +1899,6 @@ static int eata2x_eh_abort(struct scsi_cmnd *SCarg) printk("%s: abort, mbox %d, interrupt pending.\n", ha->board_name, i); - if (SCarg->eh_state == SCSI_STATE_TIMEOUT) { - unmap_dma(i, ha); - SCarg->host_scribble = NULL; - ha->cp_stat[i] = FREE; - printk - ("%s, abort, mbox %d, eh_state timeout, pid %ld.\n", - ha->board_name, i, SCarg->pid); - return SUCCESS; - } - return FAILED; } |