lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 452/575] pinctrl: equilibrium: Fix function addition in multiple groups
    Date
    From: Rahul Tanwar <rtanwar@maxlinear.com>

    [ Upstream commit 53b3947ddb7f309d1f611f8dc9bfd6ea9d699907 ]

    Ignore the same function with multiple groups.
    Fix a typo in error print.

    Fixes: 1948d5c51dba ("pinctrl: Add pinmux & GPIO controller driver for a new SoC")
    Signed-off-by: Rahul Tanwar <rtanwar@maxlinear.com>
    Link: https://lore.kernel.org/r/20211020093815.20870-1-rtanwar@maxlinear.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pinctrl/pinctrl-equilibrium.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/pinctrl/pinctrl-equilibrium.c b/drivers/pinctrl/pinctrl-equilibrium.c
    index ac1c47f542c11..3b6dcaa80e000 100644
    --- a/drivers/pinctrl/pinctrl-equilibrium.c
    +++ b/drivers/pinctrl/pinctrl-equilibrium.c
    @@ -674,6 +674,11 @@ static int eqbr_build_functions(struct eqbr_pinctrl_drv_data *drvdata)
    return ret;

    for (i = 0; i < nr_funcs; i++) {
    +
    + /* Ignore the same function with multiple groups */
    + if (funcs[i].name == NULL)
    + continue;
    +
    ret = pinmux_generic_add_function(drvdata->pctl_dev,
    funcs[i].name,
    funcs[i].groups,
    @@ -805,7 +810,7 @@ static int pinctrl_reg(struct eqbr_pinctrl_drv_data *drvdata)

    ret = eqbr_build_functions(drvdata);
    if (ret) {
    - dev_err(dev, "Failed to build groups\n");
    + dev_err(dev, "Failed to build functions\n");
    return ret;
    }

    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-15 21:38    [W:4.038 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site