Skip to content

Commit

Permalink
serial/sunzilog: fix keyboard on SUN SPARCstation
Browse files Browse the repository at this point in the history
The keyboard on my SUN SPARCstation 5 no longer worked.

    The culprint was: d4e33fa
    ("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>
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Apr 4, 2012
1 parent 2533e82 commit ca6f327
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/tty/serial/sunzilog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit ca6f327

Please sign in to comment.