From patchwork Mon Apr 22 13:43:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Poddar, Sourav" X-Patchwork-Id: 2471931 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9D9FEDF23A for ; Mon, 22 Apr 2013 13:45:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754113Ab3DVNog (ORCPT ); Mon, 22 Apr 2013 09:44:36 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:35006 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754015Ab3DVNoT (ORCPT ); Mon, 22 Apr 2013 09:44:19 -0400 Received: from dbdlxv05.itg.ti.com ([172.24.171.60]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r3MDiA33001686; Mon, 22 Apr 2013 08:44:11 -0500 Received: from DBDE70.ent.ti.com (dbde70.ent.ti.com [172.24.170.148]) by dbdlxv05.itg.ti.com (8.14.3/8.13.8) with ESMTP id r3MDi3rH031200; Mon, 22 Apr 2013 08:44:08 -0500 Received: from dbdp33.itg.ti.com (172.24.170.252) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Mon, 22 Apr 2013 19:14:04 +0530 Received: from a0131647.apr.dhcp.ti.com (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp33.itg.ti.com (8.13.8/8.13.8) with ESMTP id r3MDhxTF004666; Mon, 22 Apr 2013 19:14:04 +0530 From: Sourav Poddar To: , , , CC: , , , Sourav Poddar Subject: [PATCHv2 2/5] driver: serial: omap: prevent runtime PM for "no_console_suspend" Date: Mon, 22 Apr 2013 19:13:54 +0530 Message-ID: <1366638237-6880-3-git-send-email-sourav.poddar@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1366638237-6880-1-git-send-email-sourav.poddar@ti.com> References: <1366638237-6880-1-git-send-email-sourav.poddar@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The driver manages "no_console_suspend" by preventing runtime PM during the suspend path, which forces the console UART to stay awake. Signed-off-by: Sourav Poddar --- drivers/tty/serial/omap-serial.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 08332f3..640b14e 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1582,7 +1582,7 @@ static int serial_omap_runtime_suspend(struct device *dev) struct uart_omap_port *up = dev_get_drvdata(dev); struct omap_uart_port_info *pdata = dev->platform_data; - if (!up) + if (!up || (!console_suspend_enabled && uart_console(&up->port))) return -EINVAL; if (!pdata) @@ -1614,6 +1614,9 @@ static int serial_omap_runtime_resume(struct device *dev) int loss_cnt = serial_omap_get_context_loss_count(up); + if (!console_suspend_enabled && uart_console(&up->port)) + return -EINVAL; + if (loss_cnt < 0) { dev_err(dev, "serial_omap_get_context_loss_count failed : %d\n", loss_cnt);