diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2012-04-04 03:35:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-04 03:37:10 -0400 |
commit | ca6f327dfdc6b3b90aa0c5247182ae023dce6450 (patch) | |
tree | 873fe868515b33454c9aa84d76503d563590aff4 /drivers/tty | |
parent | 2533e824153b51bda27fe41ed1a5512047f42707 (diff) |
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 b3b70b0bf85..babd9470982 100644 --- a/drivers/tty/serial/sunzilog.c +++ b/drivers/tty/serial/sunzilog.c | |||
@@ -1581,7 +1581,7 @@ static int __init sunzilog_init(void) | |||
1581 | if (err) | 1581 | if (err) |
1582 | goto out_unregister_uart; | 1582 | goto out_unregister_uart; |
1583 | 1583 | ||
1584 | if (!zilog_irq) { | 1584 | if (zilog_irq) { |
1585 | struct uart_sunzilog_port *up = sunzilog_irq_chain; | 1585 | struct uart_sunzilog_port *up = sunzilog_irq_chain; |
1586 | err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED, | 1586 | err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED, |
1587 | "zs", sunzilog_irq_chain); | 1587 | "zs", sunzilog_irq_chain); |
@@ -1622,7 +1622,7 @@ static void __exit sunzilog_exit(void) | |||
1622 | { | 1622 | { |
1623 | platform_driver_unregister(&zs_driver); | 1623 | platform_driver_unregister(&zs_driver); |
1624 | 1624 | ||
1625 | if (!zilog_irq) { | 1625 | if (zilog_irq) { |
1626 | struct uart_sunzilog_port *up = sunzilog_irq_chain; | 1626 | struct uart_sunzilog_port *up = sunzilog_irq_chain; |
1627 | 1627 | ||
1628 | /* Disable Interrupts */ | 1628 | /* Disable Interrupts */ |