From patchwork Mon Dec 14 13:59:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Westerberg X-Patchwork-Id: 67293 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBEDwQDQ031867 for ; Mon, 14 Dec 2009 13:58:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757286AbZLNN60 (ORCPT ); Mon, 14 Dec 2009 08:58:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757015AbZLNN6Z (ORCPT ); Mon, 14 Dec 2009 08:58:25 -0500 Received: from smtp.nokia.com ([192.100.122.233]:47592 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756902AbZLNN6Y (ORCPT ); Mon, 14 Dec 2009 08:58:24 -0500 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nBEDwAph009591; Mon, 14 Dec 2009 15:58:19 +0200 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Dec 2009 15:58:00 +0200 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Dec 2009 15:57:59 +0200 Received: from localhost.localdomain (esdhcp04137.research.nokia.com [172.21.41.37]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nBEDvwBj005385; Mon, 14 Dec 2009 15:57:58 +0200 From: Mika Westerberg To: tony@atomide.com Cc: linux-omap@vger.kernel.org, Kevin Hilman Subject: [PATCH] OMAP3: serial - fix bug introduced in f62349ee9788b1d94c55eb6c291d74a1f69bdd9e Date: Mon, 14 Dec 2009 15:59:18 +0200 Message-Id: <1260799158-20064-1-git-send-email-ext-mika.1.westerberg@nokia.com> X-Mailer: git-send-email 1.5.6.5 X-OriginalArrivalTime: 14 Dec 2009 13:57:59.0589 (UTC) FILETIME=[71F6ED50:01CA7CC5] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 39b797b..19805a7 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -640,12 +640,9 @@ void __init omap_serial_early_init(void) uart->num = i; p->private_data = uart; uart->p = p; - list_add_tail(&uart->node, &uart_list); if (cpu_is_omap44xx()) p->irq += 32; - - omap_uart_enable_clocks(uart); } } @@ -673,9 +670,13 @@ void __init omap_serial_init_port(int port) pdev = &uart->pdev; dev = &pdev->dev; + omap_uart_enable_clocks(uart); + omap_uart_reset(uart); omap_uart_idle_init(uart); + list_add_tail(&uart->node, &uart_list); + if (WARN_ON(platform_device_register(pdev))) return;