2.6.25-rc7

 drivers

 ata

diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index c79f066..9a10878 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -24,7 +24,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME   "pata_hpt37x"
-#define DRV_VERSION   "0.6.9"
+#define DRV_VERSION   "0.6.11"
 
 struct hpt_clock {
    u8   xfer_speed;
@@ -281,7 +281,7 @@ static unsigned long hpt370_filter(struct ata_device *adev, unsigned long mask)
       if (hpt_dma_blacklisted(adev, "UDMA", bad_ata33))
          mask &= ~ATA_MASK_UDMA;
       if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
-         mask &= ~(0x1F << ATA_SHIFT_UDMA);
+         mask &= ~(0xE0 << ATA_SHIFT_UDMA);
    }
    return ata_pci_default_filter(adev, mask);
 }
@@ -297,7 +297,7 @@ static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)
 {
    if (adev->class == ATA_DEV_ATA) {
       if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
-         mask &= ~ (0x1F << ATA_SHIFT_UDMA);
+         mask &= ~(0xE0 << ATA_SHIFT_UDMA);
    }
    return ata_pci_default_filter(adev, mask);
 }
@@ -847,15 +847,16 @@ static u32 hpt374_read_freq(struct pci_dev *pdev)
    u32 freq;
    unsigned long io_base = pci_resource_start(pdev, 4);
    if (PCI_FUNC(pdev->devfn) & 1) {
-      struct pci_dev *pdev_0 = pci_get_slot(pdev->bus, pdev->devfn - 1);
+      struct pci_dev *pdev_0;
+
+      pdev_0 = pci_get_slot(pdev->bus, pdev->devfn - 1);
       /* Someone hot plugged the controller on us ? */
       if (pdev_0 == NULL)
          return 0;
       io_base = pci_resource_start(pdev_0, 4);
       freq = inl(io_base + 0x90);
       pci_dev_put(pdev_0);
-   }
-   else
+   } else
       freq = inl(io_base + 0x90);
    return freq;
 }