1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 2a6412f5d117..b2e71e6473ed 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -2,6 +2,7 @@
  *    pata_efar.c - EFAR PIIX clone controller driver
  *
  *      (C) 2005 Red Hat
+ *      (C) 2009 Bartlomiej Zolnierkiewicz
  *
  *    Some parts based on ata_piix.c by Jeff Garzik and others.
  *
@@ -118,12 +119,12 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev)
                 int shift = 4 * ap->port_no;
                 u8 slave_data;
 
-                idetm_data &= 0xCC0F;
+                idetm_data &= 0xFF0F;
                 idetm_data |= (control << 4);
 
                 /* Slave timing in separate register */
                 pci_read_config_byte(dev, 0x44, &slave_data);
-                slave_data &= 0x0F << shift;
+                slave_data &= ap->port_no ? 0x0F : 0xF0;
                 slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << shift;
                 pci_write_config_byte(dev, 0x44, slave_data);
         }
@@ -200,7 +201,7 @@ static void efar_set_dmamode (struct ata_port *ap, struct ata_device *adev)
                         master_data &= 0xFF4F;  /* Mask out IORDY|TIME1|DMAONLY */
                         master_data |= control << 4;
                         pci_read_config_byte(dev, 0x44, &slave_data);
-                        slave_data &= (0x0F + 0xE1 * ap->port_no);
+                        slave_data &= ap->port_no ? 0x0F : 0xF0;
                         /* Load the matching timing */
                         slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << (ap->port_no ? 4 : 0);
                         pci_write_config_byte(dev, 0x44, slave_data);
@@ -251,7 +252,7 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         static const struct ata_port_info info = {
                 .flags          = ATA_FLAG_SLAVE_POSS,
                 .pio_mask       = ATA_PIO4,
-                .mwdma_mask     = ATA_MWDMA2,
+                .mwdma_mask     = ATA_MWDMA12_ONLY,
                 .udma_mask      = ATA_UDMA4,
                 .port_ops       = &efar_ops,
         };