lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 297/717] pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe()
    Date
    From: Yu Kuai <yukuai3@huawei.com>

    [ Upstream commit 89cce2b3f247a434ee174ab6803698041df98014 ]

    if of_find_device_by_node() succeed, pinctrl_falcon_probe() doesn't have
    a corresponding put_device(). Thus add put_device() to fix the exception
    handling for this function implementation.

    Fixes: e316cb2b16bb ("OF: pinctrl: MIPS: lantiq: adds support for FALCON SoC")
    Signed-off-by: Yu Kuai <yukuai3@huawei.com>
    Link: https://lore.kernel.org/r/20201119011219.2248232-1-yukuai3@huawei.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pinctrl/pinctrl-falcon.c | 14 +++++++++-----
    1 file changed, 9 insertions(+), 5 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-falcon.c b/drivers/pinctrl/pinctrl-falcon.c
    index 62c02b969327f..7521a924dffb0 100644
    --- a/drivers/pinctrl/pinctrl-falcon.c
    +++ b/drivers/pinctrl/pinctrl-falcon.c
    @@ -431,24 +431,28 @@ static int pinctrl_falcon_probe(struct platform_device *pdev)

    /* load and remap the pad resources of the different banks */
    for_each_compatible_node(np, NULL, "lantiq,pad-falcon") {
    - struct platform_device *ppdev = of_find_device_by_node(np);
    const __be32 *bank = of_get_property(np, "lantiq,bank", NULL);
    struct resource res;
    + struct platform_device *ppdev;
    u32 avail;
    int pins;

    if (!of_device_is_available(np))
    continue;

    - if (!ppdev) {
    - dev_err(&pdev->dev, "failed to find pad pdev\n");
    - continue;
    - }
    if (!bank || *bank >= PORTS)
    continue;
    if (of_address_to_resource(np, 0, &res))
    continue;
    +
    + ppdev = of_find_device_by_node(np);
    + if (!ppdev) {
    + dev_err(&pdev->dev, "failed to find pad pdev\n");
    + continue;
    + }
    +
    falcon_info.clk[*bank] = clk_get(&ppdev->dev, NULL);
    + put_device(&ppdev->dev);
    if (IS_ERR(falcon_info.clk[*bank])) {
    dev_err(&ppdev->dev, "failed to get clock\n");
    of_node_put(np);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:02    [W:4.041 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site