sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate()
authorTejun Heo <tj@kernel.org>
Fri, 14 May 2010 09:48:50 +0000 (11:48 +0200)
committerJeff Garzik <jgarzik@redhat.com>
Sat, 15 May 2010 02:07:17 +0000 (22:07 -0400)
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>
drivers/ata/sata_nv.c

index 2a98b09ab7357cca4ee654ff2b7e7e79b2ba6eb7..9d3dbc8a11848e9dbda2511fdfd69bbf25da87c7 100644 (file)
@@ -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