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:15:31 -0700 |
| commit | 6d15bfe0c47ced1a603ab7d7352be68842be19fb (patch) | |
| tree | cb3cee93beda4d1b8c3ddbaebe2e14cf80678e17 /drivers | |
| parent | 5d121956703ea2e5ab9f73c48e225cbccbc9d9b6 (diff) | |
| download | kernel-crypto-6d15bfe0c47ced1a603ab7d7352be68842be19fb.tar.gz kernel-crypto-6d15bfe0c47ced1a603ab7d7352be68842be19fb.tar.xz kernel-crypto-6d15bfe0c47ced1a603ab7d7352be68842be19fb.zip | |
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')
| -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 0c82d335c55..59bf706fe91 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 |