From patchwork Wed Nov 24 19:09:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 354001 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAOJ9KVL021986 for ; Wed, 24 Nov 2010 19:09:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756026Ab0KXTJI (ORCPT ); Wed, 24 Nov 2010 14:09:08 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:58983 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754253Ab0KXTJH (ORCPT ); Wed, 24 Nov 2010 14:09:07 -0500 Received: by gyb11 with SMTP id 11so45748gyb.19 for ; Wed, 24 Nov 2010 11:09:06 -0800 (PST) Received: by 10.150.98.19 with SMTP id v19mr1454168ybb.274.1290625746732; Wed, 24 Nov 2010 11:09:06 -0800 (PST) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id p38sm1251085ybk.4.2010.11.24.11.09.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 24 Nov 2010 11:09:05 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, "Govindraj R." Subject: [PATCH] OMAP: UART: don't resume UARTs that are not enabled. Date: Wed, 24 Nov 2010 11:09:03 -0800 Message-Id: <1290625743-8370-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.2.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Nov 2010 19:09:33 +0000 (UTC) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index becf0e3..bc934db 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -406,7 +406,7 @@ void omap_uart_resume_idle(int num) struct omap_uart_state *uart; list_for_each_entry(uart, &uart_list, node) { - if (num == uart->num) { + if (num == uart->num && uart->can_sleep) { omap_uart_enable_clocks(uart); /* Check for IO pad wakeup */