lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 066/247] watchdog: rti-wdt: Fix pm_runtime_get_sync() error checking
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit b3ac0c58fa8934926360268f3d89ec7680644d7b ]

    If the device is already in a runtime PM enabled state
    pm_runtime_get_sync() will return 1, so a test for negative
    value should be used to check for errors.

    Fixes: 2d63908bdbfb ("watchdog: Add K3 RTI watchdog support")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Link: https://lore.kernel.org/r/20220412070824.23708-1-linmq006@gmail.com
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/watchdog/rti_wdt.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
    index ae7f9357bb87..46c2a4bd9ebe 100644
    --- a/drivers/watchdog/rti_wdt.c
    +++ b/drivers/watchdog/rti_wdt.c
    @@ -227,7 +227,7 @@ static int rti_wdt_probe(struct platform_device *pdev)

    pm_runtime_enable(dev);
    ret = pm_runtime_get_sync(dev);
    - if (ret) {
    + if (ret < 0) {
    pm_runtime_put_noidle(dev);
    pm_runtime_disable(&pdev->dev);
    return dev_err_probe(dev, ret, "runtime pm failed\n");
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 15:06    [W:4.357 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site