From: Marijn Suijten <marijn.suijten@somainline.org>
To: phone-devel@vger.kernel.org
Cc: ~postmarketos/upstreaming@lists.sr.ht,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@somainline.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Martin Botka <martin.botka@somainline.org>,
Jami Kettunen <jami.kettunen@somainline.org>,
Pavel Dubrova <pashadubrova@gmail.com>,
Marijn Suijten <marijn.suijten@somainline.org>,
Daniel Thompson <daniel.thompson@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Lee Jones <lee.jones@linaro.org>,
Jingoo Han <jingoohan1@gmail.com>,
Kiran Gunda <kgunda@codeaurora.org>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 02/13] backlight: qcom-wled: Pass number of elements to read to read_u32_array
Date: Thu, 7 Oct 2021 23:33:49 +0200 [thread overview]
Message-ID: <20211007213400.258371-3-marijn.suijten@somainline.org> (raw)
In-Reply-To: <20211007213400.258371-1-marijn.suijten@somainline.org>
of_property_read_u32_array takes the number of elements to read as last
argument. This does not always need to be 4 (sizeof(u32)) but should
instead be the size of the array in DT as read just above with
of_property_count_elems_of_size.
To not make such an error go unnoticed again the driver now bails
accordingly when of_property_read_u32_array returns an error.
Surprisingly the indentation of newlined arguments is lining up again
after prepending `rc = `.
Fixes: 775d2ffb4af6 ("backlight: qcom-wled: Restructure the driver for WLED3")
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
---
drivers/video/backlight/qcom-wled.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c
index 8a42ed89c59c..d413b913fef3 100644
--- a/drivers/video/backlight/qcom-wled.c
+++ b/drivers/video/backlight/qcom-wled.c
@@ -1535,10 +1535,15 @@ static int wled_configure(struct wled *wled)
return -EINVAL;
}
- of_property_read_u32_array(dev->of_node,
+ rc = of_property_read_u32_array(dev->of_node,
"qcom,enabled-strings",
wled->cfg.enabled_strings,
- sizeof(u32));
+ string_len);
+ if (rc) {
+ dev_err(dev, "Failed to read %d elements from qcom,enabled-strings: %d\n",
+ string_len, rc);
+ return rc;
+ }
for (i = 0; i < string_len; ++i) {
if (wled->cfg.enabled_strings[i] >= wled->max_string_count) {
--
2.33.0
next prev parent reply other threads:[~2021-10-07 21:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 21:33 [PATCH v2 00/13] backlight: qcom-wled: fix and solidify handling of enabled-strings Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 01/13] backlight: qcom-wled: Validate enabled string indices in DT Marijn Suijten
2021-10-07 21:33 ` Marijn Suijten [this message]
2021-10-07 21:33 ` [PATCH v2 03/13] backlight: qcom-wled: Use cpu_to_le16 macro to perform conversion Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 04/13] backlight: qcom-wled: Fix off-by-one maximum with default num_strings Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 05/13] backlight: qcom-wled: Override default length with qcom,enabled-strings Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 06/13] backlight: qcom-wled: Remove unnecessary 4th default string in WLED3 Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 07/13] backlight: qcom-wled: Provide enabled_strings default for WLED 4 and 5 Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 08/13] backlight: qcom-wled: Remove unnecessary double whitespace Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 09/13] backlight: qcom-wled: Respect enabled-strings in set_brightness Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 10/13] arm64: dts: qcom: pmi8994: Fix "eternal"->"external" typo in WLED node Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 11/13] arm64: dts: qcom: pmi8994: Remove hardcoded linear WLED enabled-strings Marijn Suijten
2021-10-07 21:33 ` [PATCH v2 12/13] arm64: dts: qcom: Move WLED num-strings from pmi8994 to sony-xperia-tone Marijn Suijten
2021-10-07 21:34 ` [PATCH v2 13/13] arm64: dt: qcom: pm660l: Remove board-specific WLED configuration Marijn Suijten
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=20211007213400.258371-3-marijn.suijten@somainline.org \
--to=marijn.suijten@somainline.org \
--cc=agross@kernel.org \
--cc=angelogioacchino.delregno@somainline.org \
--cc=bjorn.andersson@linaro.org \
--cc=daniel.thompson@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jami.kettunen@somainline.org \
--cc=jingoohan1@gmail.com \
--cc=kgunda@codeaurora.org \
--cc=konrad.dybcio@somainline.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.botka@somainline.org \
--cc=pashadubrova@gmail.com \
--cc=phone-devel@vger.kernel.org \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/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).