diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-04-04 09:35:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-04 00:37:10 -0700 |
| commit | ca6f327dfdc6b3b90aa0c5247182ae023dce6450 (patch) | |
| tree | 873fe868515b33454c9aa84d76503d563590aff4 /drivers/tty | |
| parent | 2533e824153b51bda27fe41ed1a5512047f42707 (diff) | |
| download | linux-ca6f327dfdc6b3b90aa0c5247182ae023dce6450.tar.gz linux-ca6f327dfdc6b3b90aa0c5247182ae023dce6450.tar.bz2 linux-ca6f327dfdc6b3b90aa0c5247182ae023dce6450.zip | |
serial/sunzilog: fix keyboard on SUN SPARCstation
The keyboard on my SUN SPARCstation 5 no longer worked.
The culprint was: d4e33fac2408d37f7b52e80ca2a89f9fb482914f
("serial: Kill off NO_IRQ")
Fix up logic for no irq / irq so the keyboard works again.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sunzilog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c index b3b70b0bf85b..babd9470982b 100644 --- a/drivers/tty/serial/sunzilog.c +++ b/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 */ |