From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frans Klaver Subject: Re: [PATCH 03/15] tty: serial: 8250_core: add run time pm Date: Wed, 20 Aug 2014 11:23:21 +0200 Message-ID: <20140820092319.GA20775@ci00147.xsens-tech.local> References: <1408124563-31541-1-git-send-email-bigeasy@linutronix.de> <1408124563-31541-4-git-send-email-bigeasy@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Return-path: Received: from filter1.ibarracuda.nl ([83.247.7.10]:50609 "EHLO filter1.ibarracuda.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752017AbaHTJXZ (ORCPT ); Wed, 20 Aug 2014 05:23:25 -0400 Content-Disposition: inline In-Reply-To: <1408124563-31541-4-git-send-email-bigeasy@linutronix.de> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Sebastian Andrzej Siewior Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tony@atomide.com, balbi@ti.com, Vinod Koul , Greg Kroah-Hartman , mika.westerberg@linux.intel.com Hi, On Fri, Aug 15, 2014 at 07:42:31PM +0200, Sebastian Andrzej Siewior wrote: > --- a/drivers/tty/serial/8250/8250_core.c > +++ b/drivers/tty/serial/8250/8250_core.c > @@ -1899,12 +1984,22 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits) > > static int serial8250_get_poll_char(struct uart_port *port) > { > - unsigned char lsr = serial_port_in(port, UART_LSR); > + unsigned char lsr; > + int status; > + > + serial8250_rpm_get(up); or up won't be defined below. You probably need + struct uart_8250_port *up = up_to_u8250p(port); somewhere in there. > - if (!(lsr & UART_LSR_DR)) > - return NO_POLL_CHAR; > + lsr = serial_port_in(port, UART_LSR); > > - return serial_port_in(port, UART_RX); > + if (!(lsr & UART_LSR_DR)) { > + status = NO_POLL_CHAR; > + goto out; > + } > + > + status = serial_port_in(port, UART_RX); > +out: > + serial8250_rpm_put(up); > + return status; > } Cheers, Frans