From: Finn Thain <fthain@telegraphics.com.au>
Date: Sun, 3 Jan 2016 05:05:47 +0000 (+1100)
Subject: ncr5380: Fix NDEBUG_NO_DATAOUT flag
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf1a0c6f8f2c1959082f1b55b907dde100c87501;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

ncr5380: Fix NDEBUG_NO_DATAOUT flag

NDEBUG_NO_DATAOUT should not disable DATA IN phases too. Fix this.
(This bug has long been fixed in atari_NCR5380.c.)

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

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 9ef26b64255a..be40c965fffb 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1838,7 +1838,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
 				continue;
 			}
 			switch (phase) {
-			case PHASE_DATAIN:
 			case PHASE_DATAOUT:
 #if (NDEBUG & NDEBUG_NO_DATAOUT)
 				printk("scsi%d : NDEBUG_NO_DATAOUT set, attempted DATAOUT aborted\n", instance->host_no);
@@ -1848,6 +1847,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
 				cmd->scsi_done(cmd);
 				return;
 #endif
+			case PHASE_DATAIN:
 				/* 
 				 * If there is no room left in the current buffer in the
 				 * scatter-gather list, move onto the next one.