lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 191/219] power: supply: ab8500_charger: Fix an error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit bf59fddde1c3eab89eb8dca8f3d3dc097887d2bb ]

    'ret' is know to be 0 at this point, because it has not been updated by the
    the previous call to 'abx500_mask_and_set_register_interruptible()'.

    Fix it by updating 'ret' before checking if an error occurred.

    Fixes: 84edbeeab67c ("ab8500-charger: AB8500 charger driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/power/supply/ab8500_charger.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
    index 5cee9aa87aa3..037e93224c38 100644
    --- a/drivers/power/supply/ab8500_charger.c
    +++ b/drivers/power/supply/ab8500_charger.c
    @@ -3218,7 +3218,7 @@ static int ab8500_charger_init_hw_registers(struct ab8500_charger *di)
    }

    /* Enable backup battery charging */
    - abx500_mask_and_set_register_interruptible(di->dev,
    + ret = abx500_mask_and_set_register_interruptible(di->dev,
    AB8500_RTC, AB8500_RTC_CTRL_REG,
    RTC_BUP_CH_ENA, RTC_BUP_CH_ENA);
    if (ret < 0)
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 00:25    [W:5.708 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site