diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 19:24:21 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 19:24:21 +0400 |
| commit | a92bc5a65ce966ccc49bc8e37c6714c0b4042818 (patch) | |
| tree | 86df7b619b654a0ded4cfa0b37f8a0b57b674f96 /drivers | |
| parent | 167d82152079debd0a76726972a76ea032d82043 (diff) | |
| parent | ca6f327dfdc6b3b90aa0c5247182ae023dce6450 (diff) | |
| download | linux-a92bc5a65ce966ccc49bc8e37c6714c0b4042818.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sparc fixes from David Miller:
"One build regression and one serial probe regression fix on sparc."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
serial/sunzilog: fix keyboard on SUN SPARCstation
sparc: pgtable_64: change include order
Diffstat (limited to 'drivers')
| -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 */ |