diff options
| author | Tejun Heo <tj@kernel.org> | 2010-05-14 11:48:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-05 11:10:27 -0700 |
| commit | 6ef0d693d4b10c2b7dfdc1fcfad716437e024ad3 (patch) | |
| tree | cbcd1921e4e00b6d625fe55e51bf6332f8345d89 /drivers/ata | |
| parent | d700d271763f3073230b43bcdf8d24a1a844fd91 (diff) | |
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>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_nv.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 |