sata_nv: enable hotplug interrupt and fix some readl/readw mismatches

[safe/jmp/linux-2.6] / drivers / ata / pata_oldpiix.c

diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index b76d2b4..45215aa 100644 (file)
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -25,7 +25,7 @@
 #include <linux/ata.h>
 
 #define DRV_NAME       "pata_oldpiix"
-#define DRV_VERSION    "0.5.2"
+#define DRV_VERSION    "0.5.3"
 
 /**
  *     oldpiix_pre_reset               -       probe begin
@@ -94,19 +94,21 @@ static void oldpiix_set_piomode (struct ata_port *ap, struct ata_device *adev)
                            { 2, 1 },
                            { 2, 3 }, };
 
-       if (pio > 2)
-               control |= 1;   /* TIME1 enable */
+       if (pio > 1)
+               control |= 1;   /* TIME */
        if (ata_pio_need_iordy(adev))
-               control |= 2;   /* IE IORDY */
+               control |= 2;   /* IE */
 
-       /* Intel specifies that the PPE functionality is for disk only */
+       /* Intel specifies that the prefetch/posting is for disk only */
        if (adev->class == ATA_DEV_ATA)
-               control |= 4;   /* PPE enable */
+               control |= 4;   /* PPE */
 
        pci_read_config_word(dev, idetm_port, &idetm_data);
 
-       /* Enable PPE, IE and TIME as appropriate. Clear the other
-          drive timing bits */
+       /*
+        * Set PPE, IE and TIME as appropriate.
+        * Clear the other drive's timing bits.
+        */
        if (adev->devno == 0) {
                idetm_data &= 0xCCE0;
                idetm_data |= control;