drm/nouveau: off by one in init_i2c_device_find()

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

diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 019575b..b8578c3 100644 (file)
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -26,6 +26,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/gfp.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
@@ -89,7 +90,7 @@ static struct ata_port_operations uli_ops = {
 static const struct ata_port_info uli_port_info = {
        .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                          ATA_FLAG_IGN_SIMPLEX,
-       .pio_mask       = 0x1f,         /* pio0-4 */
+       .pio_mask       = ATA_PIO4,
        .udma_mask      = ATA_UDMA6,
        .port_ops       = &uli_ops,
 };
@@ -180,9 +181,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (rc)
                return rc;
 
-       rc = ata_pci_bmdma_init(host);
-       if (rc)
-               return rc;
+       ata_pci_bmdma_init(host);
 
        iomap = host->iomap;
 
@@ -243,7 +242,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        pci_set_master(pdev);
        pci_intx(pdev, 1);
-       return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
+       return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,
                                 IRQF_SHARED, &uli_sht);
 }