lkml.org 
[lkml]   [2021]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 30/36] leds: lp5523: check return value of lp5xx_read and jump to cleanup code
    Date
    From: Phillip Potter <phil@philpotter.co.uk>

    commit 6647f7a06eb030a2384ec71f0bb2e78854afabfe upstream.

    Check return value of lp5xx_read and if non-zero, jump to code at end of
    the function, causing lp5523_stop_all_engines to be executed before
    returning the error value up the call chain. This fixes the original
    commit (248b57015f35) which was reverted due to the University of Minnesota
    problems.

    Cc: stable <stable@vger.kernel.org>
    Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
    Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
    Link: https://lore.kernel.org/r/20210503115736.2104747-10-gregkh@linuxfoundation.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/leds/leds-lp5523.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/leds/leds-lp5523.c
    +++ b/drivers/leds/leds-lp5523.c
    @@ -318,7 +318,9 @@ static int lp5523_init_program_engine(st

    /* Let the programs run for couple of ms and check the engine status */
    usleep_range(3000, 6000);
    - lp55xx_read(chip, LP5523_REG_STATUS, &status);
    + ret = lp55xx_read(chip, LP5523_REG_STATUS, &status);
    + if (ret)
    + goto out;
    status &= LP5523_ENG_STATUS_MASK;

    if (status != LP5523_ENG_STATUS_MASK) {

    \
     
     \ /
      Last update: 2021-05-24 17:39    [W:6.826 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site