diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /drivers/acpi/osl.c | |
| parent | d37dc42ab6f040b8f0f2962ab219c5b2accf748d (diff) | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index d59f08ecaf16..d916bea729f1 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -353,8 +353,10 @@ static irqreturn_t acpi_irq(int irq, void *dev_id) | |||
| 353 | if (handled) { | 353 | if (handled) { |
| 354 | acpi_irq_handled++; | 354 | acpi_irq_handled++; |
| 355 | return IRQ_HANDLED; | 355 | return IRQ_HANDLED; |
| 356 | } else | 356 | } else { |
| 357 | acpi_irq_not_handled++; | ||
| 357 | return IRQ_NONE; | 358 | return IRQ_NONE; |
| 359 | } | ||
| 358 | } | 360 | } |
| 359 | 361 | ||
| 360 | acpi_status | 362 | acpi_status |