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 430/717] watchdog: sprd: remove watchdog disable from resume fail path
    Date
    From: Lingling Xu <ling_ling.xu@unisoc.com>

    [ Upstream commit f61a59acb462840bebcc192f754fe71b6a16ff99 ]

    sprd_wdt_start() would return fail if the loading operation is not completed
    in a certain time, disabling watchdog for that case would probably cause
    the kernel crash when kick watchdog later, that's too bad, so remove the
    watchdog disable operation for the fail case to make sure other parts in
    the kernel can run normally.

    [ chunyan: Massaged changelog ]

    Fixes: 477603467009 ("watchdog: Add Spreadtrum watchdog driver")
    Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com>
    Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Link: https://lore.kernel.org/r/20201029023933.24548-2-zhang.lyra@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/sprd_wdt.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c
    index 65cb55f3916fc..f3c90b4afead1 100644
    --- a/drivers/watchdog/sprd_wdt.c
    +++ b/drivers/watchdog/sprd_wdt.c
    @@ -345,15 +345,10 @@ static int __maybe_unused sprd_wdt_pm_resume(struct device *dev)
    if (ret)
    return ret;

    - if (watchdog_active(&wdt->wdd)) {
    + if (watchdog_active(&wdt->wdd))
    ret = sprd_wdt_start(&wdt->wdd);
    - if (ret) {
    - sprd_wdt_disable(wdt);
    - return ret;
    - }
    - }

    - return 0;
    + return ret;
    }

    static const struct dev_pm_ops sprd_wdt_pm_ops = {
    --
    2.27.0


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