pata_hpt3x2n: always stretch UltraDMA timing

commit 60661933995bc7a09686c901439e17c2a4ea7d5d upstream.

The UltraDMA Tss timing must be stretched with ATA clock of 66 MHz, but the
driver only does this when PCI clock is 66 MHz, whereas it always programs
DPLL clock (which is used as the ATA clock) to 66 MHz.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index d16e87e29189a64ae2e88aaec8b887f37d174183..d9f2913f159b3a086b6d1ce6c3d4d59bd6292bab 100644 (file)
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "pata_hpt3x2n"
-#define DRV_VERSION    "0.3.8"
+#define DRV_VERSION    "0.3.9"
 
 enum {
        HPT_PCI_FAST    =       (1 << 31),
@@ -547,16 +547,16 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)
               pci_mhz);
        /* Set our private data up. We only need a few flags so we use
           it directly */
-       if (pci_mhz > 60) {
+       if (pci_mhz > 60)
                hpriv = (void *)(PCI66 | USE_DPLL);
-               /*
-                * On  HPT371N, if ATA clock is 66 MHz we must set bit 2 in
-                * the MISC. register to stretch the UltraDMA Tss timing.
-                * NOTE: This register is only writeable via I/O space.
-                */
-               if (dev->device == PCI_DEVICE_ID_TTI_HPT371)
-                       outb(inb(iobase + 0x9c) | 0x04, iobase + 0x9c);
-       }
+
+       /*
+        * On  HPT371N, if ATA clock is 66 MHz we must set bit 2 in
+        * the MISC. register to stretch the UltraDMA Tss timing.
+        * NOTE: This register is only writeable via I/O space.
+        */
+       if (dev->device == PCI_DEVICE_ID_TTI_HPT371)
+               outb(inb(iobase + 0x9c) | 0x04, iobase + 0x9c);
 
        /* Now kick off ATA set up */
        return ata_pci_sff_init_one(dev, ppi, &hpt3x2n_sht, hpriv);