From patchwork Mon Nov 20 10:45:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 10066281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CBF66602B7 for ; Mon, 20 Nov 2017 10:45:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC7BE29158 for ; Mon, 20 Nov 2017 10:45:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B12F729163; Mon, 20 Nov 2017 10:45:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B8B829166 for ; Mon, 20 Nov 2017 10:45:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751061AbdKTKp6 (ORCPT ); Mon, 20 Nov 2017 05:45:58 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:43592 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750764AbdKTKp4 (ORCPT ); Mon, 20 Nov 2017 05:45:56 -0500 Received: by mail-lf0-f67.google.com with SMTP id 73so9500464lfu.10; Mon, 20 Nov 2017 02:45:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uLBEhamrBUII5D5q30lhplYRvI6tWB5A3toQegSylJ8=; b=sY0w5X3F6tyUCFucxN5DrzS/hGYxO1zqdliW+y2f6Uh66pynhYemIvGq6mfMLgpxoE uO9s+/M3vwsM6QALbt1TkTOLZ+YCDdIqGGcp3Y4laa2LtibhEUeR3rXqjZqQndbRgk9B F9V0qB0T4wAWatLEhalPaSp2uCK0mGM+TkcH2WObbymfnnaqhSVcnFYxF/k4GWqheRKN tXeP2FziW3JB45DbSF9W+MIQ/VSv5HcBsjqAh4NqADsQOZAumqyVM0BFGfomSMdiGDCb dgwtxLk8NPAqykiONL6YLd073SSy/l5hqb/inhg6RzhbDrKZaOAylSDhUSbbFpZgFH4R JsGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uLBEhamrBUII5D5q30lhplYRvI6tWB5A3toQegSylJ8=; b=a3yBTPD/lrQhTcO2VUuZiC5I+2It8AP0vDy8KWU4LHxim5pcjL8AmaN+a6dJoVW0dS ZDQpbwkCKKm9TnlexT9esnkfJRkM9pDUGfNVuCSU0oSH2zxEJpeeLW/fC2DXEdLnn66q 34ooQnKHY0/SjalNIzG+G1V8yN1K9a9ZrzZu7NtzAfREJR+U7sArmcXNB9wNeuSz8d1W xLUkym5NCtniYzZZ8cJsWAzEPuTCrxlJM8XZ8ggkbE0xjvcxzbQFxpXiDnJRyXHkvN00 r1rLseK7CTi9nuOB4DM7bG15Cew3GqEOdMpKULFGkSBkrL/Wh6NmF995Kq8wg1miojXA RdDQ== X-Gm-Message-State: AJaThX65xEReii0bei99MBj9ZnHp/eXzYe2H74SqA3CvBw1ZTwvYz5XH F6xZHgMN8/Zb/YqXewSV+1k= X-Google-Smtp-Source: AGs4zMZzE18ZGM4q9LQPlqobsgphG/1Wi8BuSX80IjSGg3gc88RKIk77SeJ+++Fv/0nHgBD/L5vvMg== X-Received: by 10.25.152.82 with SMTP id a79mr3207728lfe.237.1511174754675; Mon, 20 Nov 2017 02:45:54 -0800 (PST) Received: from xi.terra (c-c0bae655.07-184-6d6c6d4.cust.bredbandsbolaget.se. [85.230.186.192]) by smtp.gmail.com with ESMTPSA id r101sm1891978lfi.17.2017.11.20.02.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 02:45:53 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1eGjaJ-0000hR-Vp; Mon, 20 Nov 2017 11:45:52 +0100 From: Johan Hovold To: Lee Jones Cc: Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable , Guennadi Liakhovetski Subject: [PATCH v2 1/4] backlight: as3711_bl: fix device-tree node lookup Date: Mon, 20 Nov 2017 11:45:44 +0100 Message-Id: <20171120104547.2639-2-johan@kernel.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171120104547.2639-1-johan@kernel.org> References: <20171120104547.2639-1-johan@kernel.org> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 mfd node was also prematurely freed. Fixes: 59eb2b5e57ea ("drivers/video/backlight/as3711_bl.c: add OF support") Cc: stable # 3.10 Cc: Guennadi Liakhovetski Signed-off-by: Johan Hovold Acked-by: Daniel Thompson --- drivers/video/backlight/as3711_bl.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/video/backlight/as3711_bl.c b/drivers/video/backlight/as3711_bl.c index 734a9158946b..e55304d5cf07 100644 --- a/drivers/video/backlight/as3711_bl.c +++ b/drivers/video/backlight/as3711_bl.c @@ -262,10 +262,10 @@ static int as3711_bl_register(struct platform_device *pdev, static int as3711_backlight_parse_dt(struct device *dev) { struct as3711_bl_pdata *pdata = dev_get_platdata(dev); - struct device_node *bl = - of_find_node_by_name(dev->parent->of_node, "backlight"), *fb; + struct device_node *bl, *fb; int ret; + bl = of_get_child_by_name(dev->parent->of_node, "backlight"); if (!bl) { dev_dbg(dev, "backlight node not found\n"); return -ENODEV; @@ -279,7 +279,7 @@ static int as3711_backlight_parse_dt(struct device *dev) if (pdata->su1_max_uA <= 0) ret = -EINVAL; if (ret < 0) - return ret; + goto err_put_bl; } fb = of_parse_phandle(bl, "su2-dev", 0); @@ -292,7 +292,7 @@ static int as3711_backlight_parse_dt(struct device *dev) if (pdata->su2_max_uA <= 0) ret = -EINVAL; if (ret < 0) - return ret; + goto err_put_bl; if (of_find_property(bl, "su2-feedback-voltage", NULL)) { pdata->su2_feedback = AS3711_SU2_VOLTAGE; @@ -314,8 +314,10 @@ static int as3711_backlight_parse_dt(struct device *dev) pdata->su2_feedback = AS3711_SU2_CURR_AUTO; count++; } - if (count != 1) - return -EINVAL; + if (count != 1) { + ret = -EINVAL; + goto err_put_bl; + } count = 0; if (of_find_property(bl, "su2-fbprot-lx-sd4", NULL)) { @@ -334,8 +336,10 @@ static int as3711_backlight_parse_dt(struct device *dev) pdata->su2_fbprot = AS3711_SU2_GPIO4; count++; } - if (count != 1) - return -EINVAL; + if (count != 1) { + ret = -EINVAL; + goto err_put_bl; + } count = 0; if (of_find_property(bl, "su2-auto-curr1", NULL)) { @@ -355,11 +359,20 @@ static int as3711_backlight_parse_dt(struct device *dev) * At least one su2-auto-curr* must be specified iff * AS3711_SU2_CURR_AUTO is used */ - if (!count ^ (pdata->su2_feedback != AS3711_SU2_CURR_AUTO)) - return -EINVAL; + if (!count ^ (pdata->su2_feedback != AS3711_SU2_CURR_AUTO)) { + ret = -EINVAL; + goto err_put_bl; + } } + of_node_put(bl); + return 0; + +err_put_bl: + of_node_put(bl); + + return ret; } static int as3711_backlight_probe(struct platform_device *pdev)