| Message ID | 20200913210825.2022552-1-drew@beagleboard.org |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: single: check if #pinctrl-cells exceeds 3 | expand |
* Linus Walleij <linus.walleij@linaro.org> [200929 12:51]: > On Sun, Sep 13, 2020 at 11:17 PM Drew Fustini <drew@beagleboard.org> wrote: > > > The property #pinctrl-cells can either be 2 or 3. There is currently > > only a check to make sure that #pinctrl-cells is 2 or greater. This > > patch adds a check to make sure it is not greater than 3. > > > > Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2") > > Reported-by: Trent Piepho <tpiepho@gmail.com> > > Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/ > > Signed-off-by: Drew Fustini <drew@beagleboard.org> > > Tony, does this and the other patch look good to you? Hmm well the description looks a bit confusing, #pinctrl-cells can also be 1 that's the default. Might be worth clarifying that part. Regards, Tony
On Wed, Sep 30, 2020 at 08:16:59AM +0300, Tony Lindgren wrote: > * Linus Walleij <linus.walleij@linaro.org> [200929 12:51]: > > On Sun, Sep 13, 2020 at 11:17 PM Drew Fustini <drew@beagleboard.org> wrote: > > > > > The property #pinctrl-cells can either be 2 or 3. There is currently > > > only a check to make sure that #pinctrl-cells is 2 or greater. This > > > patch adds a check to make sure it is not greater than 3. > > > > > > Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2") > > > Reported-by: Trent Piepho <tpiepho@gmail.com> > > > Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/ > > > Signed-off-by: Drew Fustini <drew@beagleboard.org> > > > > Tony, does this and the other patch look good to you? > > Hmm well the description looks a bit confusing, #pinctrl-cells can > also be 1 that's the default. Might be worth clarifying that part. > > Regards, > > Tony Yes, that was my fault for confusing #pinctrl-cells with pinctrl_spec.args_count. - if #pinctrl-cells = <1>, then pinctrl_spec.args_count = 2 - if #pinctrl-cells = <2>, then pinctrl_spec.args_count = 3 - all other values are not valid I will post a v2. Thanks, Drew
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index efe41abc5d47..5cbf0e55087c 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1014,7 +1014,7 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs, if (res) return res; - if (pinctrl_spec.args_count < 2) { + if (pinctrl_spec.args_count < 2 || pinctrl_spec.args_count > 3) { dev_err(pcs->dev, "invalid args_count for spec: %i\n", pinctrl_spec.args_count); break;
The property #pinctrl-cells can either be 2 or 3. There is currently only a check to make sure that #pinctrl-cells is 2 or greater. This patch adds a check to make sure it is not greater than 3. Fixes: a13395418888 ("pinctrl: single: parse #pinctrl-cells = 2") Reported-by: Trent Piepho <tpiepho@gmail.com> Link: https://lore.kernel.org/linux-omap/3139716.CMS8C0sQ7x@zen.local/ Signed-off-by: Drew Fustini <drew@beagleboard.org> --- drivers/pinctrl/pinctrl-single.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)