diff options
Diffstat (limited to 'drivers/scsi/NCR5380.c')
-rw-r--r-- | drivers/scsi/NCR5380.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index f8e449a98d29..5b27966d37f0 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
@@ -2133,7 +2133,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { | |||
2133 | sink = 1; | 2133 | sink = 1; |
2134 | do_abort(instance); | 2134 | do_abort(instance); |
2135 | cmd->result = DID_ERROR << 16; | 2135 | cmd->result = DID_ERROR << 16; |
2136 | cmd->done(cmd); | 2136 | cmd->scsi_done(cmd); |
2137 | return; | 2137 | return; |
2138 | #endif | 2138 | #endif |
2139 | /* | 2139 | /* |
@@ -2196,7 +2196,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { | |||
2196 | sink = 1; | 2196 | sink = 1; |
2197 | do_abort(instance); | 2197 | do_abort(instance); |
2198 | cmd->result = DID_ERROR << 16; | 2198 | cmd->result = DID_ERROR << 16; |
2199 | cmd->done(cmd); | 2199 | cmd->scsi_done(cmd); |
2200 | /* XXX - need to source or sink data here, as appropriate */ | 2200 | /* XXX - need to source or sink data here, as appropriate */ |
2201 | } else | 2201 | } else |
2202 | cmd->SCp.this_residual -= transfersize - len; | 2202 | cmd->SCp.this_residual -= transfersize - len; |
@@ -2740,7 +2740,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) { | |||
2740 | tmp->host_scribble = NULL; | 2740 | tmp->host_scribble = NULL; |
2741 | tmp->result = DID_ABORT << 16; | 2741 | tmp->result = DID_ABORT << 16; |
2742 | dprintk(NDEBUG_ABORT, ("scsi%d : abort removed command from issue queue.\n", instance->host_no)); | 2742 | dprintk(NDEBUG_ABORT, ("scsi%d : abort removed command from issue queue.\n", instance->host_no)); |
2743 | tmp->done(tmp); | 2743 | tmp->scsi_done(tmp); |
2744 | return SUCCESS; | 2744 | return SUCCESS; |
2745 | } | 2745 | } |
2746 | #if (NDEBUG & NDEBUG_ABORT) | 2746 | #if (NDEBUG & NDEBUG_ABORT) |
@@ -2805,7 +2805,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) { | |||
2805 | *prev = (Scsi_Cmnd *) tmp->host_scribble; | 2805 | *prev = (Scsi_Cmnd *) tmp->host_scribble; |
2806 | tmp->host_scribble = NULL; | 2806 | tmp->host_scribble = NULL; |
2807 | tmp->result = DID_ABORT << 16; | 2807 | tmp->result = DID_ABORT << 16; |
2808 | tmp->done(tmp); | 2808 | tmp->scsi_done(tmp); |
2809 | return SUCCESS; | 2809 | return SUCCESS; |
2810 | } | 2810 | } |
2811 | } | 2811 | } |