From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758551AbYEUVyU (ORCPT ); Wed, 21 May 2008 17:54:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1765804AbYEUVyA (ORCPT ); Wed, 21 May 2008 17:54:00 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:33763 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932225AbYEUVxz (ORCPT ); Wed, 21 May 2008 17:53:55 -0400 Date: Wed, 21 May 2008 14:53:38 -0700 From: Andrew Morton To: Arjan van de Ven Cc: linux-kernel@vger.kernel.org, alan@lxorguk.ukuu.org.uk Subject: Re: [PATCH] serial: fix enable_irq_wake/disable_irq_wake imbalance in serial_core.c Message-Id: <20080521145338.022abd3b.akpm@linux-foundation.org> In-Reply-To: <20080519201141.1dbe6cc1@linux.intel.com> References: <20080519201141.1dbe6cc1@linux.intel.com> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 19 May 2008 20:11:41 -0700 Arjan van de Ven wrote: > From: Arjan van de Ven > Subject: [PATCH] serial: fix enable_irq_wake/disable_irq_wake imbalance in serial_core.c > > enable_irq_wake() and disable_irq_wake() need to be balanced. > However, serial_core.c calls these for different conditions during > the suspend and resume functions... > > This is causing a regular WARN_ON() as found at > http://www.kerneloops.org/search.php?search=set_irq_wake > > This patch makes the conditions for triggering the _wake > enable/disable sequence identical. > > Signed-off-by: Arjan van de Ven > --- > drivers/serial/serial_core.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c > index eab0327..4df9ee1 100644 > --- a/drivers/serial/serial_core.c > +++ b/drivers/serial/serial_core.c > @@ -2054,6 +2054,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port) > int uart_resume_port(struct uart_driver *drv, struct uart_port *port) > { > struct uart_state *state = drv->state + port->line; > + struct device *tty_dev; > + struct uart_match match = {port, drv}; > > mutex_lock(&state->mutex); > > @@ -2063,7 +2065,8 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port) > return 0; > } > > - if (!port->suspended) { > + tty_dev = device_find_child(port->dev, &match, serial_match_port); > + if (!port->suspended && device_may_wakeup(tty_dev)) { > disable_irq_wake(port->irq); > mutex_unlock(&state->mutex); > return 0; erp, is that the easiest way of going from a uart_driver* to a device*? Doing a lookup each time is a bit unusual.