Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / sata_highbank.c

diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index 24e311fe2c1c3ebf90431b99f67e5ac09cb2c572..8638d575b2b99baef3d9a429e99fbc5287b4f1e1 100644 (file)
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -499,6 +499,7 @@ static int ahci_highbank_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
+       hpriv->irq = irq;
        hpriv->flags |= (unsigned long)pi.private_data;
 
        hpriv->mmio = devm_ioremap(dev, mem->start, resource_size(mem));
@@ -568,7 +569,7 @@ static int ahci_highbank_probe(struct platform_device *pdev)
        ahci_init_controller(host);
        ahci_print_info(host, "platform");
 
-       rc = ahci_host_activate(host, irq, &ahci_highbank_platform_sht);
+       rc = ahci_host_activate(host, &ahci_highbank_platform_sht);
        if (rc)
                goto err0;