From: Tejun Heo Date: Fri, 14 May 2010 09:48:50 +0000 (+0200) Subject: sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95cc2c70c139936a2142bcd583da8af6f9d88efb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate() sata_nv was incorrectly using ata_host_activate() instead of ata_pci_sff_activate_host() leading to IRQ assignment failure in legacy mode. Fix it. Signed-off-by: Tejun Heo Cc: Robert Hancock Cc: stable@kernel.org Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 2a98b09ab735..9d3dbc8a1184 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -2479,8 +2479,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); - return ata_host_activate(host, pdev->irq, ipriv->irq_handler, - IRQF_SHARED, ipriv->sht); + return ata_pci_sff_activate_host(host, ipriv->irq_handler, ipriv->sht); } #ifdef CONFIG_PM