From patchwork Wed Aug 27 14:09:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tudor Laurentiu X-Patchwork-Id: 383465 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9187B1400B2 for ; Thu, 28 Aug 2014 00:12:39 +1000 (EST) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id 7CEBE1A16F8 for ; Thu, 28 Aug 2014 00:12:39 +1000 (EST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2lp0211.outbound.protection.outlook.com [207.46.163.211]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 5BA7B1A003B for ; Thu, 28 Aug 2014 00:11:57 +1000 (EST) Received: from [10.171.73.112] (192.88.166.1) by BLUPR03MB312.namprd03.prod.outlook.com (10.141.48.28) with Microsoft SMTP Server (TLS) id 15.0.1019.14; Wed, 27 Aug 2014 14:11:42 +0000 Message-ID: <53FDE6A3.3080303@freescale.com> Date: Wed, 27 Aug 2014 17:09:39 +0300 From: Laurentiu Tudor User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: , , linuxppc-dev Subject: [PATCH] of: make sure of_alias is initialized before accessing it X-Originating-IP: [192.88.166.1] X-ClientProxiedBy: DB4PR05CA0006.eurprd05.prod.outlook.com (25.160.40.16) To BLUPR03MB312.namprd03.prod.outlook.com (10.141.48.28) X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 0316567485 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(6009001)(6049001)(189002)(199003)(87266999)(99396002)(85306004)(46102001)(64706001)(50466002)(80022001)(102836001)(36756003)(21056001)(50986999)(81342001)(4396001)(33656002)(59896002)(74662001)(95666004)(54356999)(107046002)(65816999)(64126003)(229853001)(77096002)(65806001)(65956001)(47776003)(77982001)(20776003)(74502001)(66066001)(31966008)(105586002)(85852003)(83322001)(19580405001)(106356001)(81542001)(87976001)(80316001)(19580395003)(92726001)(92566001)(101416001)(90102001)(79102001)(76482001)(83506001)(23756003)(83072002)(42262002); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB312; H:[10.171.73.112]; FPR:; MLV:sfv; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-OriginatorOrg: freescale.com Cc: Grant Likely , Laurentiu Tudor X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Simply swap of_alias and of_chosen initialization so that of_alias ends up read first. This must be done because it is accessed couple of lines below when trying to initialize the of_stdout using the alias based legacy method. [Fixes a752ee5 - tty: Update hypervisor tty drivers to use core stdout parsing code] Signed-off-by: Laurentiu Tudor Cc: Grant Likely --- drivers/of/base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index d8574ad..52f8506 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1847,6 +1847,10 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) { struct property *pp; + of_aliases = of_find_node_by_path("/aliases"); + if (!of_aliases) + return; + of_chosen = of_find_node_by_path("/chosen"); if (of_chosen == NULL) of_chosen = of_find_node_by_path("/chosen@0"); @@ -1862,10 +1866,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) of_stdout = of_find_node_by_path(name); } - of_aliases = of_find_node_by_path("/aliases"); - if (!of_aliases) - return; - for_each_property_of_node(of_aliases, pp) { const char *start = pp->name; const char *end = start + strlen(start);