ncr5380: Fix NDEBUG_NO_DATAOUT flag
authorFinn Thain <fthain@telegraphics.com.au>
Sun, 3 Jan 2016 05:05:47 +0000 (16:05 +1100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 7 Jan 2016 02:43:02 +0000 (21:43 -0500)
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>
drivers/scsi/NCR5380.c

index 9ef26b64255a373412087465b9c9395eebe3fcb0..be40c965fffb96d5680374148a89ae5650a58194 100644 (file)
@@ -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.