Skip to content

Commit

Permalink
[SCSI] Fix mistaken uses of ->done
Browse files Browse the repository at this point in the history 
All these drivers meant to call ->scsi_done() but got confused.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  • Loading branch information
Matthew Wilcox authored and James Bottomley committed Oct 12, 2007
1 parent 1d0c7c8 commit cce99c6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions drivers/scsi/NCR5380.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2133,7 +2133,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
cmd->done(cmd);
cmd->scsi_done(cmd);
return;
#endif
/*
Expand Down Expand Up @@ -2196,7 +2196,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
cmd->done(cmd);
cmd->scsi_done(cmd);
/* XXX - need to source or sink data here, as appropriate */
} else
cmd->SCp.this_residual -= transfersize - len;
Expand Down Expand Up @@ -2740,7 +2740,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
tmp->host_scribble = NULL;
tmp->result = DID_ABORT << 16;
dprintk(NDEBUG_ABORT, ("scsi%d : abort removed command from issue queue.\n", instance->host_no));
tmp->done(tmp);
tmp->scsi_done(tmp);
return SUCCESS;
}
#if (NDEBUG & NDEBUG_ABORT)
Expand Down Expand Up @@ -2805,7 +2805,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
*prev = (Scsi_Cmnd *) tmp->host_scribble;
tmp->host_scribble = NULL;
tmp->result = DID_ABORT << 16;
tmp->done(tmp);
tmp->scsi_done(tmp);
return SUCCESS;
}
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/NCR53C9x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,7 @@ int esp_abort(Scsi_Cmnd *SCptr)
this->host_scribble = NULL;
esp_release_dmabufs(esp, this);
this->result = DID_ABORT << 16;
this->done(this);
this->scsi_done(this);
if(don)
esp->dma_ints_on(esp);
return SUCCESS;
Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/atari_NCR5380.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2041,7 +2041,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
cmd->done(cmd);
cmd->scsi_done(cmd);
return;
#endif
case PHASE_DATAIN:
Expand Down Expand Up @@ -2100,7 +2100,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
cmd->done(cmd);
cmd->scsi_done(cmd);
/* XXX - need to source or sink data here, as appropriate */
} else {
#ifdef REAL_DMA
Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/sun3_NCR5380.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
cmd->done(cmd);
cmd->scsi_done(cmd);
return;
#endif
case PHASE_DATAIN:
Expand Down Expand Up @@ -2115,7 +2115,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
cmd->done(cmd);
cmd->scsi_done(cmd);
/* XXX - need to source or sink data here, as appropriate */
} else {
#ifdef REAL_DMA
Expand Down

0 comments on commit cce99c6

Please sign in to comment.