8 files changed, 14 insertions, 20 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 826b63d1aa84..69c73c36b923 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -457,7 +457,7 @@ static void prepare_info(struct Scsi_Host *instance)
                  instance->base, instance->irq,
                  instance->can_queue, instance->cmd_per_lun,
                  instance->sg_tablesize, instance->this_id,
-                 hostdata->flags & FLAG_NO_DMA_FIXUP  ? "NO_DMA_FIXUP "  : "",
+                 hostdata->flags & FLAG_DMA_FIXUP     ? "DMA_FIXUP "     : "",
                  hostdata->flags & FLAG_NO_PSEUDO_DMA ? "NO_PSEUDO_DMA " : "",
                  hostdata->flags & FLAG_TOSHIBA_DELAY ? "TOSHIBA_DELAY "  : "",
 #ifdef AUTOPROBE_IRQ
@@ -1480,11 +1480,11 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
          * before the setting of DMA mode to after transfer of the last byte.
          */
 
-        if (hostdata->flags & FLAG_NO_DMA_FIXUP)
+        if (hostdata->flags & FLAG_DMA_FIXUP)
+                NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY);
+        else
                 NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY |
                                         MR_ENABLE_EOP_INTR);
-        else
-                NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_MONITOR_BSY);
 
         dprintk(NDEBUG_DMA, "scsi%d : mode reg = 0x%X\n", instance->host_no, NCR5380_read(MODE_REG));
 
@@ -1540,8 +1540,8 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
 
         if (p & SR_IO) {
                 foo = NCR5380_pread(instance, d,
-                        hostdata->flags & FLAG_NO_DMA_FIXUP ? c : c - 1);
-                if (!foo && !(hostdata->flags & FLAG_NO_DMA_FIXUP)) {
+                        hostdata->flags & FLAG_DMA_FIXUP ? c - 1 : c);
+                if (!foo && (hostdata->flags & FLAG_DMA_FIXUP)) {
                         /*
                          * The workaround was to transfer fewer bytes than we
                          * intended to with the pseudo-DMA read function, wait for
@@ -1571,7 +1571,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
                 }
         } else {
                 foo = NCR5380_pwrite(instance, d, c);
-                if (!foo && !(hostdata->flags & FLAG_NO_DMA_FIXUP)) {
+                if (!foo && (hostdata->flags & FLAG_DMA_FIXUP)) {
                         /*
                          * Wait for the last byte to be sent.  If REQ is being asserted for
                          * the byte we're interested, we'll ACK it and it will go false.
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index 0b03ba25bd66..7b488a082462 100644
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -220,7 +220,7 @@
 #define NO_IRQ          0
 #endif
 
-#define FLAG_NO_DMA_FIXUP               1       /* No DMA errata workarounds */
+#define FLAG_DMA_FIXUP                  1       /* Use DMA errata workarounds */
 #define FLAG_NO_PSEUDO_DMA              8       /* Inhibit DMA */
 #define FLAG_LATE_DMA_SETUP             32      /* Setup NCR before DMA H/W */
 #define FLAG_TAGGED_QUEUING             64      /* as X3T9.2 spelled it */
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 221f18c5df93..76b2d3364d9f 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -239,7 +239,7 @@ static int cumanascsi1_probe(struct expansion_card *ec,
 
         host->irq = ec->irq;
 
-        ret = NCR5380_init(host, 0);
+        ret = NCR5380_init(host, FLAG_DMA_FIXUP);
         if (ret)
                 goto out_unmap;
 
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 1fab1d1896b1..8d8426535e6d 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -143,7 +143,7 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         host->irq = NO_IRQ;
         host->n_io_port = 255;
 
-        ret = NCR5380_init(host, 0);
+        ret = NCR5380_init(host, FLAG_DMA_FIXUP);
         if (ret)
                 goto out_unmap;
 
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index 6c736b071cf4..30919f42759a 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -229,7 +229,7 @@ found:
                 instance->base = addr;
                 ((struct NCR5380_hostdata *)(instance)->hostdata)->base = base;
 
-                if (NCR5380_init(instance, FLAG_NO_DMA_FIXUP))
+                if (NCR5380_init(instance, 0))
                         goto out_unregister;
 
                 NCR5380_maybe_reset_bus(instance);
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index b8fc26d9231d..aaeb6b6b4b16 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -348,23 +348,17 @@ static int __init generic_NCR5380_detect(struct scsi_host_template *tpnt)
                 flags = 0;
                 switch (overrides[current_override].board) {
                 case BOARD_NCR5380:
-                        flags = FLAG_NO_PSEUDO_DMA;
-                        break;
-                case BOARD_NCR53C400:
-                        flags = FLAG_NO_DMA_FIXUP;
+                        flags = FLAG_NO_PSEUDO_DMA | FLAG_DMA_FIXUP;
                         break;
                 case BOARD_NCR53C400A:
-                        flags = FLAG_NO_DMA_FIXUP;
                         ports = ncr_53c400a_ports;
                         magic = ncr_53c400a_magic;
                         break;
                 case BOARD_HP_C2502:
-                        flags = FLAG_NO_DMA_FIXUP;
                         ports = ncr_53c400a_ports;
                         magic = hp_c2502_magic;
                         break;
                 case BOARD_DTC3181E:
-                        flags = FLAG_NO_DMA_FIXUP;
                         ports = dtc_3181e_ports;
                         magic = ncr_53c400a_magic;
                         break;
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 512037e27783..7589fea01186 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -377,7 +377,7 @@ static int __init pas16_detect(struct scsi_host_template *tpnt)
                 
         instance->io_port = io_port;
 
-        if (NCR5380_init(instance, 0))
+        if (NCR5380_init(instance, FLAG_DMA_FIXUP))
                 goto out_unregister;
 
         NCR5380_maybe_reset_bus(instance);
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 4615fda60dbd..6cb8bdd2f4e6 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -210,7 +210,7 @@ found:
         instance->base = base;
         ((struct NCR5380_hostdata *)instance->hostdata)->base = p;
 
-        if (NCR5380_init(instance, 0))
+        if (NCR5380_init(instance, FLAG_DMA_FIXUP))
                 goto out_unregister;
 
         NCR5380_maybe_reset_bus(instance);