5 files changed, 7 insertions, 14 deletions

diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index 680e5975217f..ca0c46f6580a 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -379,7 +379,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .enablebits     = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
                 .port_ops       = &cmd64x_port_ops,
                 .host_flags     = IDE_HFLAG_CLEAR_SIMPLEX |
-                                  IDE_HFLAG_ABUSE_PREFETCH,
+                                  IDE_HFLAG_ABUSE_PREFETCH |
+                                  IDE_HFLAG_SERIALIZE,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = 0x00, /* no udma */
@@ -389,7 +390,8 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .init_chipset   = init_chipset_cmd64x,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .port_ops       = &cmd648_port_ops,
-                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH |
+                                  IDE_HFLAG_SERIALIZE,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA2,
diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
index 983d957a0189..b883838adc24 100644
--- a/drivers/ide/cs5535.c
+++ b/drivers/ide/cs5535.c
@@ -187,6 +187,7 @@ static int __devinit cs5535_init_one(struct pci_dev *dev,
 
 static const struct pci_device_id cs5535_pci_tbl[] = {
         { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_CS5535_IDE), 0 },
+        { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5535_IDE), },
         { 0, },
 };
 
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c
index d3440b5010a5..6e7ae2b6cfc6 100644
--- a/drivers/ide/ide-ioctls.c
+++ b/drivers/ide/ide-ioctls.c
@@ -162,7 +162,7 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
         if (tf->command == ATA_CMD_SET_FEATURES &&
             tf->feature == SETFEATURES_XFER &&
             tf->nsect >= XFER_SW_DMA_0) {
-                xfer_rate = ide_find_dma_mode(drive, XFER_UDMA_6);
+                xfer_rate = ide_find_dma_mode(drive, tf->nsect);
                 if (xfer_rate != tf->nsect) {
                         err = -EINVAL;
                         goto abort;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 63c53d65e875..4d76ba473097 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
                 if (port_ops && port_ops->init_dev)
                         port_ops->init_dev(drive);
         }
-
-        ide_port_for_each_dev(i, drive, hwif) {
-                /*
-                 * default to PIO Mode 0 before we figure out
-                 * the most suited mode for the attached device
-                 */
-                if (port_ops && port_ops->set_pio_mode)
-                        port_ops->set_pio_mode(drive, 0);
-        }
 }
 
 static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
index 9aec78d3bcff..1ccfb40e7215 100644
--- a/drivers/ide/slc90e66.c
+++ b/drivers/ide/slc90e66.c
@@ -91,8 +91,7 @@ static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
 
                 if (!(reg48 & u_flag))
                         pci_write_config_word(dev, 0x48, reg48|u_flag);
-                /* FIXME: (reg4a & a_speed) ? */
-                if ((reg4a & u_speed) != u_speed) {
+                if ((reg4a & a_speed) != u_speed) {
                         pci_write_config_word(dev, 0x4a, reg4a & ~a_speed);
                         pci_read_config_word(dev, 0x4a, &reg4a);
                         pci_write_config_word(dev, 0x4a, reg4a|u_speed);