diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /drivers/char/hvc_irq.c | |
| parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'drivers/char/hvc_irq.c')
| -rw-r--r-- | drivers/char/hvc_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hvc_irq.c b/drivers/char/hvc_irq.c index d09e5688d449..2623e177e8d6 100644 --- a/drivers/char/hvc_irq.c +++ b/drivers/char/hvc_irq.c | |||
| @@ -37,7 +37,7 @@ int notifier_add_irq(struct hvc_struct *hp, int irq) | |||
| 37 | 37 | ||
| 38 | void notifier_del_irq(struct hvc_struct *hp, int irq) | 38 | void notifier_del_irq(struct hvc_struct *hp, int irq) |
| 39 | { | 39 | { |
| 40 | if (!irq) | 40 | if (!hp->irq_requested) |
| 41 | return; | 41 | return; |
| 42 | free_irq(irq, hp); | 42 | free_irq(irq, hp); |
| 43 | hp->irq_requested = 0; | 43 | hp->irq_requested = 0; |