diff options
| author | David Shaohua Li <shaohua.li@intel.com> | 2005-04-01 00:07:31 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 00:03:30 -0400 |
| commit | c9c3e457de24cca2ca688fa397d93a241f472048 (patch) | |
| tree | 570b7a07f9c6f570341481500a2bff21c1328d8d /drivers/acpi | |
| parent | acf05f4b7f558051ea0028e8e617144123650272 (diff) | |
| download | linux-c9c3e457de24cca2ca688fa397d93a241f472048.tar.bz2 | |
[ACPI] PNPACPI vs sound IRQ
http://bugme.osdl.org/show_bug.cgi?id=4016
Written-by: David Shaohua Li <shaohua.li@intel.com>
Acked-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/pci_link.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index f2271173bbd5..6ad0e77df9b3 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -804,9 +804,12 @@ static int __init acpi_irq_penalty_update(char *str, int used) * There is no ISA_POSSIBLE weight, so we simply use * the (small) PCI_USING penalty. */ -void acpi_penalize_isa_irq(int irq) +void acpi_penalize_isa_irq(int irq, int active) { - acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING; + if (active) + acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED; + else + acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING; } /* |