Merge branch 'master' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / ide / ide_platform.c

diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c
index 42965b3e30b9bb270f74be175e1b35190de714bc..542603b394e4a59997ca82940598b3a64f8edfd9 100644 (file)
--- a/drivers/ide/ide_platform.c
+++ b/drivers/ide/ide_platform.c
@@ -95,6 +95,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
        plat_ide_setup_ports(&hw, base, alt_base, pdata, res_irq->start);
        hw.dev = &pdev->dev;
 
+       d.irq_flags = res_irq->flags;
        if (mmio)
                d.host_flags |= IDE_HFLAG_MMIO;