From patchwork Tue Aug 9 14:16:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Voss, Nikolaus" X-Patchwork-Id: 1049742 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p79EH29u004286 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 9 Aug 2011 14:17:23 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qqn6x-00086S-Ph; Tue, 09 Aug 2011 14:16:52 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qqn6x-0000sF-9x; Tue, 09 Aug 2011 14:16:51 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qqn6u-0000sA-Sb for linux-arm-kernel@canuck.infradead.org; Tue, 09 Aug 2011 14:16:49 +0000 Received: from portal.weinmann.de ([62.8.140.122]) by casper.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qqn6r-0002mR-MB for linux-arm-kernel@lists.infradead.org; Tue, 09 Aug 2011 14:16:47 +0000 From: "Voss, Nikolaus" To: "'Jean-Christophe PLAGNIOL-VILLARD'" , "'Sergei Shtylyov'" Date: Tue, 9 Aug 2011 16:16:24 +0200 Subject: [PATCH] atmel_serial: fix atmel_default_console_device Thread-Topic: [PATCH] atmel_serial: fix atmel_default_console_device Thread-Index: AcxWiWowYvUB70uAQRClWD1ClH6RwQAFJubg Message-ID: References: <1307541740.10626.15.camel@hcegtvedt.norway.atmel.com> <1308666679-12111-1-git-send-email-plagnioj@jcrosoft.com> <4E411CEF.10004@ru.mvista.com> In-Reply-To: <4E411CEF.10004@ru.mvista.com> Accept-Language: en-US, de-DE Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US, de-DE MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110809_151645_915298_85B26BEE X-CRM114-Status: UNSURE ( 7.39 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (-2.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: "'Greg Kroah-Hartman'" , "'Nicolas Ferre'" , "'Linux Kernel'" , "'linux-arm-kernel@lists.infradead.org'" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 09 Aug 2011 14:17:23 +0000 (UTC) reflect new static uart platform ids introduced by patch http://article.gmane.org/gmane.linux.kernel/1126105 --- drivers/tty/serial/atmel_serial.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index af9b781..b922f5d 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1609,9 +1609,11 @@ static struct console atmel_console = { static int __init atmel_console_init(void) { if (atmel_default_console_device) { - add_preferred_console(ATMEL_DEVICENAME, - atmel_default_console_device->id, NULL); - atmel_init_port(&atmel_ports[atmel_default_console_device->id], + struct atmel_uart_data *pdata = + atmel_default_console_device->dev.platform_data; + + add_preferred_console(ATMEL_DEVICENAME, pdata->num, NULL); + atmel_init_port(&atmel_ports[pdata->num], atmel_default_console_device); register_console(&atmel_console); }