Commit f35d3474 authored Jan 03, 2016 by Finn Thain Committed by Martin K. Petersen Jan 06, 2016

ncr5380: Fix bus phase in do_abort()



NCR5380_poll_politely() returns either 0 (success) or -ETIMEDOUT. However,
in do_abort(), the return value is incorrectly taken to be the status
register value. This means that the bus is put into DATA OUT phase instead
of MESSAGE OUT. Fix this.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 1cc160e1

drivers/scsi/NCR5380.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1493,11 +1493,11 @@ static int do_abort(struct Scsi_Host *instance)
		if (rc < 0)
		return -1;

		tmp = (unsigned char)rc;
		tmp = NCR5380_read(STATUS_REG) & PHASE_MASK;

		NCR5380_write(TARGET_COMMAND_REG, PHASE_SR_TO_TCR(tmp));

		if ((tmp & PHASE_MASK) != PHASE_MSGOUT) {
		if (tmp != PHASE_MSGOUT) {
		NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE \| ICR_ASSERT_ATN \| ICR_ASSERT_ACK);
		rc = NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, 0, 3 * HZ);
		NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE \| ICR_ASSERT_ATN);

Admin message