From: Tejun Heo <tj@kernel.org>
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-Tag: firefly_0821_release~10186^2~1577
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6ef0d693d4b10c2b7dfdc1fcfad716437e024ad3;p=firefly-linux-kernel-4.4.55.git

sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()

commit 95cc2c70c139936a2142bcd583da8af6f9d88efb upstream.

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 <tj@kernel.org>
Cc: Robert Hancock <hancockr@shaw.ca>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 1eb4e020eb5c..ff6e8c694043 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -2478,8 +2478,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