Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce99c69 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by James Bottomley
Browse files

[SCSI] Fix mistaken uses of ->done 



All these drivers meant to call ->scsi_done() but got confused.

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 1d0c7c8d

drivers/scsi/NCR5380.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2133,7 +2133,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
				sink = 1;

				sink = 1;

				do_abort(instance);

				do_abort(instance);

				cmd->result = DID_ERROR << 16;

				cmd->result = DID_ERROR << 16;

				cmd->done(cmd);

				cmd->scsi_done(cmd);

				return;

				return;

#endif

#endif

				/* 

				/*
@@ -2196,7 +2196,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
						sink = 1;

						sink = 1;

						do_abort(instance);

						do_abort(instance);

						cmd->result = DID_ERROR << 16;

						cmd->result = DID_ERROR << 16;

						cmd->done(cmd);

						cmd->scsi_done(cmd);

						/* XXX - need to source or sink data here, as appropriate */

						/* XXX - need to source or sink data here, as appropriate */

					} else

					} else

						cmd->SCp.this_residual -= transfersize - len;

						cmd->SCp.this_residual -= transfersize - len;
@@ -2740,7 +2740,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) { 
			tmp->host_scribble = NULL;

			tmp->host_scribble = NULL;

			tmp->result = DID_ABORT << 16;

			tmp->result = DID_ABORT << 16;

			dprintk(NDEBUG_ABORT, ("scsi%d : abort removed command from issue queue.\n", instance->host_no));

			dprintk(NDEBUG_ABORT, ("scsi%d : abort removed command from issue queue.\n", instance->host_no));

			tmp->done(tmp);

			tmp->scsi_done(tmp);

			return SUCCESS;

			return SUCCESS;

		}

		}

#if (NDEBUG  & NDEBUG_ABORT)

#if (NDEBUG  & NDEBUG_ABORT)
@@ -2805,7 +2805,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) { 
					*prev = (Scsi_Cmnd *) tmp->host_scribble;

					*prev = (Scsi_Cmnd *) tmp->host_scribble;

					tmp->host_scribble = NULL;

					tmp->host_scribble = NULL;

					tmp->result = DID_ABORT << 16;

					tmp->result = DID_ABORT << 16;

					tmp->done(tmp);

					tmp->scsi_done(tmp);

					return SUCCESS;

					return SUCCESS;

				}

				}

		}

		}

drivers/scsi/NCR53C9x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1385,7 +1385,7 @@ int esp_abort(Scsi_Cmnd *SCptr) 
				this->host_scribble = NULL;

				this->host_scribble = NULL;

				esp_release_dmabufs(esp, this);

				esp_release_dmabufs(esp, this);

				this->result = DID_ABORT << 16;

				this->result = DID_ABORT << 16;

				this->done(this);

				this->scsi_done(this);

				if(don)

				if(don)

					esp->dma_ints_on(esp);

					esp->dma_ints_on(esp);

				return SUCCESS;

				return SUCCESS;

drivers/scsi/atari_NCR5380.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2041,7 +2041,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) 
				sink = 1;

				sink = 1;

				do_abort(instance);

				do_abort(instance);

				cmd->result = DID_ERROR << 16;

				cmd->result = DID_ERROR << 16;

				cmd->done(cmd);

				cmd->scsi_done(cmd);

				return;

				return;

#endif

#endif

			case PHASE_DATAIN:

			case PHASE_DATAIN:
@@ -2100,7 +2100,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) 
						sink = 1;

						sink = 1;

						do_abort(instance);

						do_abort(instance);

						cmd->result = DID_ERROR << 16;

						cmd->result = DID_ERROR << 16;

						cmd->done(cmd);

						cmd->scsi_done(cmd);

						/* XXX - need to source or sink data here, as appropriate */

						/* XXX - need to source or sink data here, as appropriate */

					} else {

					} else {

#ifdef REAL_DMA

#ifdef REAL_DMA

drivers/scsi/sun3_NCR5380.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2055,7 +2055,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance) 
		sink = 1;

		sink = 1;

		do_abort(instance);

		do_abort(instance);

		cmd->result = DID_ERROR  << 16;

		cmd->result = DID_ERROR  << 16;

		cmd->done(cmd);

		cmd->scsi_done(cmd);

		return;

		return;

#endif

#endif

	    case PHASE_DATAIN:

	    case PHASE_DATAIN:
@@ -2115,7 +2115,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance) 
			sink = 1;

			sink = 1;

			do_abort(instance);

			do_abort(instance);

			cmd->result = DID_ERROR  << 16;

			cmd->result = DID_ERROR  << 16;

			cmd->done(cmd);

			cmd->scsi_done(cmd);

			/* XXX - need to source or sink data here, as appropriate */

			/* XXX - need to source or sink data here, as appropriate */

		    } else {

		    } else {

#ifdef REAL_DMA

#ifdef REAL_DMA