projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge acpi-2.6.12 to-akpm
[powerpc.git]
/
drivers
/
scsi
/
u14-34f.c
diff --git
a/drivers/scsi/u14-34f.c
b/drivers/scsi/u14-34f.c
index
98369ce
..
b0b6cdf
100644
(file)
--- a/
drivers/scsi/u14-34f.c
+++ b/
drivers/scsi/u14-34f.c
@@
-1372,15
+1372,6
@@
static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) {
if (inb(sh[j]->io_port + REG_SYS_INTR) & IRQ_ASSERTED)
printk("%s: abort, mbox %d, interrupt pending.\n", BN(j), i);
if (inb(sh[j]->io_port + REG_SYS_INTR) & IRQ_ASSERTED)
printk("%s: abort, mbox %d, interrupt pending.\n", BN(j), i);
- if (SCarg->eh_state == SCSI_STATE_TIMEOUT) {
- unmap_dma(i, j);
- SCarg->host_scribble = NULL;
- HD(j)->cp_stat[i] = FREE;
- printk("%s, abort, mbox %d, eh_state timeout, pid %ld.\n",
- BN(j), i, SCarg->pid);
- return SUCCESS;
- }
-
return FAILED;
}
return FAILED;
}