diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
| commit | 1d492eb41371d9a5145651e8eb64bea1042a4057 (patch) | |
| tree | 2a66a8fd347cf8dd8a665c4575b30d873035a5a4 /drivers/pnp | |
| parent | 5d2a22079c825669d91a3a200332f1053b4b61b0 (diff) | |
| parent | cbfc1bae55bbd053308ef0fa6b6448cd1ddf3e67 (diff) | |
[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index 75575f6c349c..1e296cbef004 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c | |||
| @@ -81,7 +81,7 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, int irq) | |||
| 81 | i++; | 81 | i++; |
| 82 | if (i < PNP_MAX_IRQ) { | 82 | if (i < PNP_MAX_IRQ) { |
| 83 | res->irq_resource[i].flags = IORESOURCE_IRQ; //Also clears _UNSET flag | 83 | res->irq_resource[i].flags = IORESOURCE_IRQ; //Also clears _UNSET flag |
| 84 | if (irq == -1) { | 84 | if (irq < 0) { |
| 85 | res->irq_resource[i].flags |= IORESOURCE_DISABLED; | 85 | res->irq_resource[i].flags |= IORESOURCE_DISABLED; |
| 86 | return; | 86 | return; |
| 87 | } | 87 | } |