Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (32 commits)
  [libata] sata_mv: print out additional chip info during probe
  [libata] Use ATA_UDMAx standard masks when filling driver's udma_mask info
  [libata] AHCI: Add support for Marvell AHCI-like chips (initially 6145)
  [libata] Clean up driver udma_mask initializers
  libata: Support chips with 64K PRD quirk
  Add a PCI ID for santa rosa's PATA controller.
  sata_sil24: sil24_interrupt() micro-optimisation
  Add irq_flags to struct pata_platform_info
  sata_promise: cleanups
  [libata] pata_ixp4xx: kill unused var
  ata_piix: fix pio/mwdma programming
  [libata] ahci: minor internal cleanups
  [ATA] Add named constant for ATAPI command DEVICE RESET
  [libata] sata_sx4, sata_via: minor documentation updates
  [libata] ahci: minor internal cleanups
  [libata] ahci: Factor out SATA port init into a separate function
  [libata] pata_sil680: minor cleanups from benh
  [libata] sata_sx4: named constant cleanup
  [libata] pata_ixp4xx: convert to new EH
  [libata] pdc_adma: Reorder initializers with a couple structs
  ...

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index cbb7866940d6..79f841bca593 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -139,6 +139,7 @@ static int __devinit pata_platform_probe(struct platform_device *pdev)
         struct resource *io_res, *ctl_res;
         struct ata_host *host;
         struct ata_port *ap;
+        struct pata_platform_info *pp_info;
         unsigned int mmio;
 
         /*
@@ -208,11 +209,12 @@ static int __devinit pata_platform_probe(struct platform_device *pdev)
 
         ap->ioaddr.altstatus_addr = ap->ioaddr.ctl_addr;
 
-        pata_platform_setup_port(&ap->ioaddr, pdev->dev.platform_data);
+        pp_info = (struct pata_platform_info *)(pdev->dev.platform_data);
+        pata_platform_setup_port(&ap->ioaddr, pp_info);
 
         /* activate */
         return ata_host_activate(host, platform_get_irq(pdev, 0), ata_interrupt,
-                                 0, &pata_platform_sht);
+                                 pp_info->irq_flags, &pata_platform_sht);
 }
 
 /**