diff options
| author | Tejun Heo <tj@kernel.org> | 2010-05-14 11:48:50 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-14 22:07:17 -0400 |
| commit | 95cc2c70c139936a2142bcd583da8af6f9d88efb (patch) | |
| tree | a70b558e7a923356df6d1e9662e10933252f1738 /drivers/ata | |
| parent | 3842e835490cdf17013b30a788f6311bdcfd0571 (diff) | |
| download | blackbird-op-linux-95cc2c70c139936a2142bcd583da8af6f9d88efb.tar.gz blackbird-op-linux-95cc2c70c139936a2142bcd583da8af6f9d88efb.zip | |
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 <tj@kernel.org>
Cc: Robert Hancock <hancockr@shaw.ca>
Cc: stable@kernel.org
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
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 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 |
