From: Johan Hovold <johan@kernel.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: Daniel Thompson <daniel.thompson@linaro.org>,
Jingoo Han <jingoohan1@gmail.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Johan Hovold <johan@kernel.org>,
stable <stable@vger.kernel.org>, Qing Xu <qingx@marvell.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>
Subject: [PATCH v2 2/4] backlight: max8925_bl: fix device-tree node lookup
Date: Mon, 20 Nov 2017 10:45:45 +0000 [thread overview]
Message-ID: <20171120104547.2639-3-johan@kernel.org> (raw)
In-Reply-To: <20171120104547.2639-1-johan@kernel.org>
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,
while the child backlight node was leaked.
Fixes: 47ec340cb8e2 ("mfd: max8925: Support dt for backlight")
Cc: stable <stable@vger.kernel.org> # 3.9
Cc: Qing Xu <qingx@marvell.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/video/backlight/max8925_bl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 7b738d60ecc2..f3aa6088f1d9 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -116,7 +116,7 @@ static void max8925_backlight_dt_init(struct platform_device *pdev)
if (!pdata)
return;
- np = of_find_node_by_name(nproot, "backlight");
+ np = of_get_child_by_name(nproot, "backlight");
if (!np) {
dev_err(&pdev->dev, "failed to find backlight node\n");
return;
@@ -125,6 +125,8 @@ static void max8925_backlight_dt_init(struct platform_device *pdev)
if (!of_property_read_u32(np, "maxim,max8925-dual-string", &val))
pdata->dual_string = val;
+ of_node_put(np);
+
pdev->dev.platform_data = pdata;
}
--
2.15.0
next prev parent reply other threads:[~2017-11-20 10:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 10:45 [PATCH v2 0/4] backlight: fix device-tree node lookups Johan Hovold
2017-11-20 10:45 ` [PATCH v2 1/4] backlight: as3711_bl: fix device-tree node lookup Johan Hovold
2017-11-20 11:33 ` Daniel Thompson
2017-11-29 11:28 ` Lee Jones
2017-11-20 10:45 ` Johan Hovold [this message]
2017-11-20 11:33 ` [PATCH v2 2/4] backlight: max8925_bl: " Daniel Thompson
2017-11-29 11:29 ` Lee Jones
2017-11-20 10:45 ` [PATCH v2 3/4] backlight: tps65217_bl: " Johan Hovold
2017-11-20 11:34 ` Daniel Thompson
2017-11-20 11:44 ` Johan Hovold
2017-11-29 11:29 ` Lee Jones
2017-11-20 10:45 ` [PATCH v2 4/4] backlight: as3711_bl: fix device-tree node leaks Johan Hovold
2017-11-20 11:41 ` Daniel Thompson
2017-11-29 11:29 ` Lee Jones
2018-05-11 7:27 ` [PATCH v2 0/4] backlight: fix device-tree node lookups Johan Hovold
2018-05-11 8:13 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171120104547.2639-3-johan@kernel.org \
--to=johan@kernel.org \
--cc=b.zolnierkie@samsung.com \
--cc=daniel.thompson@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=haojian.zhuang@gmail.com \
--cc=jingoohan1@gmail.com \
--cc=lee.jones@linaro.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=qingx@marvell.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).