[SCSI] Fix mistaken uses of ->done
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>
This commit is contained in:
Родитель
1d0c7c8dcf
Коммит
cce99c6925
|
@ -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
|
||||
/*
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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:
|
||||
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче