git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
drivers
/
acpi
/
pci_link.c
diff --git
a/drivers/acpi/pci_link.c
b/drivers/acpi/pci_link.c
index
89f3b2a
..
cf47805
100644
(file)
--- a/
drivers/acpi/pci_link.c
+++ b/
drivers/acpi/pci_link.c
@@
-849,7
+849,7
@@
static int __init acpi_irq_penalty_update(char *str, int used)
if (irq < 0)
continue;
if (irq < 0)
continue;
- if (irq >= A
CPI_MAX_IRQS
)
+ if (irq >= A
RRAY_SIZE(acpi_irq_penalty)
)
continue;
if (used)
continue;
if (used)
@@
-872,10
+872,12
@@
static int __init acpi_irq_penalty_update(char *str, int used)
*/
void acpi_penalize_isa_irq(int irq, int active)
{
*/
void acpi_penalize_isa_irq(int irq, int active)
{
- if (active)
- acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
- else
- acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
+ if (irq >= 0 && irq < ARRAY_SIZE(acpi_irq_penalty)) {
+ if (active)
+ acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
+ else
+ acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
+ }
}
/*
}
/*