From patchwork Wed Apr 4 07:28:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 150614 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6B682B6F9A for ; Wed, 4 Apr 2012 17:28:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754048Ab2DDH2K (ORCPT ); Wed, 4 Apr 2012 03:28:10 -0400 Received: from smtp.snhosting.dk ([87.238.248.203]:35120 "EHLO smtp.domainteam.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754005Ab2DDH2J (ORCPT ); Wed, 4 Apr 2012 03:28:09 -0400 Received: from merkur.ravnborg.org (unknown [188.228.89.252]) by smtp.domainteam.dk (Postfix) with ESMTPA id 1D1F3F19D7; Wed, 4 Apr 2012 09:28:08 +0200 (CEST) Date: Wed, 4 Apr 2012 09:28:07 +0200 From: Sam Ravnborg To: David Miller Cc: sparclinux@vger.kernel.org, alan@linux.intel.com, Greg Kroah-Hartman Subject: [PATCH] serial/sunzilog: fix keyboard on SUN SPARCstation Message-ID: <20120404072807.GA10041@merkur.ravnborg.org> References: <20120403204455.GA29433@merkur.ravnborg.org> <20120403.173730.2013882476775933425.davem@davemloft.net> <20120403223557.GA25330@merkur.ravnborg.org> <20120403.183911.210339857039667503.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120403.183911.210339857039667503.davem@davemloft.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From 360d177dd8c19f23a26371d4e9337a46a1cde779 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Wed, 4 Apr 2012 09:00:11 +0200 Subject: [PATCH] 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 Cc: Alan Cox Cc: Greg Kroah-Hartman --- I assume the easy way is to channel this in via the sparc tree. The bug was introduced in the merge window - so this is not a stable candidate. Sam 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 b3b70b0..babd947 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 */