diff options
| author | Phillip Potter <phil@philpotter.co.uk> | 2021-05-03 13:56:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-26 12:06:56 +0200 |
| commit | 865ec95a77f7ff3480c9a0ab1da3336c943e5846 (patch) | |
| tree | 736b132975371a33166ce5aab9f0ee6de108d261 /drivers/leds | |
| parent | 33a9ff900b9b03997aabf0dba887b11f93c2f47c (diff) | |
| download | linux-stable-865ec95a77f7ff3480c9a0ab1da3336c943e5846.tar.gz linux-stable-865ec95a77f7ff3480c9a0ab1da3336c943e5846.tar.bz2 linux-stable-865ec95a77f7ff3480c9a0ab1da3336c943e5846.zip | |
leds: lp5523: check return value of lp5xx_read and jump to cleanup code
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>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-lp5523.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c index 5036d7d5f3d4..b1590cb4a188 100644 --- a/drivers/leds/leds-lp5523.c +++ b/drivers/leds/leds-lp5523.c @@ -305,7 +305,9 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip) /* 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) { |