From 3a9f7b331fda0daca18f4d89bbb40d0fcd39feca Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Wed, 4 Apr 2012 09:35:06 +0200 Subject: [PATCH] --- yaml --- r: 298537 b: refs/heads/master c: ca6f327dfdc6b3b90aa0c5247182ae023dce6450 h: refs/heads/master i: 298535: 258820cd9766a3d810ac305d01c80acc558519a2 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/sunzilog.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0639df0769d5..2a74b1c9794e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2533e824153b51bda27fe41ed1a5512047f42707 +refs/heads/master: ca6f327dfdc6b3b90aa0c5247182ae023dce6450 diff --git a/trunk/drivers/tty/serial/sunzilog.c b/trunk/drivers/tty/serial/sunzilog.c index b3b70b0bf85b..babd9470982b 100644 --- a/trunk/drivers/tty/serial/sunzilog.c +++ b/trunk/drivers/tty/serial/sunzilog.c @@ -1581,7 +1581,7 @@ static int __init sunzilog_init(void) if (err) goto out_unregister_uart; - if (!zilog_irq) { + if (zilog_irq) { struct uart_sunzilog_port *up = sunzilog_irq_chain; err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED, "zs", sunzilog_irq_chain); @@ -1622,7 +1622,7 @@ static void __exit sunzilog_exit(void) { platform_driver_unregister(&zs_driver); - if (!zilog_irq) { + if (zilog_irq) { struct uart_sunzilog_port *up = sunzilog_irq_chain; /* Disable Interrupts */