Prev: [patch 014/164] Staging: rt2870: add device ID of MelCo.,Inc. WLI-UC-G301N
Next: [patch 021/164] ACPI: video: fix acpi_backlight=video
From: Greg KH on 1 Jul 2010 18:30
2.6.33-stable review patch. If anyone has any objections, please let me know.

------------------

From: Tejun Heo <tj(a)kernel.org>

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

---
drivers/ata/sata_nv.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -2478,8 +2478,7 @@ static int nv_init_one(struct pci_dev *p
}

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


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [patch 014/164] Staging: rt2870: add device ID of MelCo.,Inc. WLI-UC-G301N
Next: [patch 021/164] ACPI: video: fix acpi_backlight=video