Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / hvc_irq.c

diff --git a/drivers/char/hvc_irq.c b/drivers/char/hvc_irq.c
index d09e5688d4497242d4bcc6dcad23abc1a4f96202..2623e177e8d61d501fe1c39dd57d3768bfcad481 100644 (file)
--- 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)
 
 void notifier_del_irq(struct hvc_struct *hp, int irq)
 {
-       if (!irq)
+       if (!hp->irq_requested)
                return;
        free_irq(irq, hp);
        hp->irq_requested = 0;