From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755421AbdKMUPn (ORCPT ); Mon, 13 Nov 2017 15:15:43 -0500 Received: from lelnx194.ext.ti.com ([198.47.27.80]:26842 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755094AbdKMUPk (ORCPT ); Mon, 13 Nov 2017 15:15:40 -0500 Subject: Re: [PATCH 2/2] mfd: twl6040: fix child-node lookup To: Johan Hovold , Tony Lindgren CC: Lee Jones , , , stable , Samuel Ortiz References: <20171111153844.16741-1-johan@kernel.org> <20171111153844.16741-2-johan@kernel.org> From: Peter Ujfalusi Message-ID: Date: Mon, 13 Nov 2017 22:14:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171111153844.16741-2-johan@kernel.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-GB Content-Transfer-Encoding: 8bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/11/2017 05:38 PM, Johan Hovold wrote: > Fix child-node lookup during probe, which ended up searching the whole > device tree depth-first starting at the parent rather than just matching > on its children. > > To make things worse, the parent node was prematurely freed, while the > child node was leaked. > > Note that the CONFIG_OF compile guard can be removed as > of_get_child_by_name() provides a !CONFIG_OF implementation which always > fails. Acked-by: Peter Ujfalusi > > Fixes: 37e13cecaa14 ("mfd: Add support for Device Tree to twl6040") > Fixes: ca2cad6ae38e ("mfd: Fix twl6040 build failure") > Cc: stable # 3.5 > Cc: Peter Ujfalusi > Cc: Samuel Ortiz > --- > drivers/mfd/twl6040.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c > index d66502d36ba0..dd19f17a1b63 100644 > --- a/drivers/mfd/twl6040.c > +++ b/drivers/mfd/twl6040.c > @@ -97,12 +97,16 @@ static struct reg_sequence twl6040_patch[] = { > }; > > > -static bool twl6040_has_vibra(struct device_node *node) > +static bool twl6040_has_vibra(struct device_node *parent) > { > -#ifdef CONFIG_OF > - if (of_find_node_by_name(node, "vibra")) > + struct device_node *node; > + > + node = of_get_child_by_name(parent, "vibra"); > + if (node) { > + of_node_put(node); > return true; > -#endif > + } > + > return false; > } > > -- Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki