|
Takashi Iwai |
e5b442 |
From 8d1beda5f11953ffe135a5213287f0b25b4da41b Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
e5b442 |
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
e5b442 |
Date: Mon, 3 May 2021 13:56:35 +0200
|
|
Takashi Iwai |
e5b442 |
Subject: [PATCH] Revert "leds: lp5523: fix a missing check of return value of lp55xx_read"
|
|
Takashi Iwai |
e5b442 |
Git-commit: 8d1beda5f11953ffe135a5213287f0b25b4da41b
|
|
Takashi Iwai |
e5b442 |
Patch-mainline: v5.13-rc3
|
|
Takashi Iwai |
e5b442 |
References: git-fixes
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
This reverts commit 248b57015f35c94d4eae2fdd8c6febf5cd703900.
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
Because of recent interactions with developers from @umn.edu, all
|
|
Takashi Iwai |
e5b442 |
commits from them have been recently re-reviewed to ensure if they were
|
|
Takashi Iwai |
e5b442 |
correct or not.
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
Upon review, this commit was found to be incorrect for the reasons
|
|
Takashi Iwai |
e5b442 |
below, so it must be reverted. It will be fixed up "correctly" in a
|
|
Takashi Iwai |
e5b442 |
later kernel change.
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
The original commit does not properly unwind if there is an error
|
|
Takashi Iwai |
e5b442 |
condition so it needs to be reverted at this point in time.
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
Cc: Kangjie Lu <kjlu@umn.edu>
|
|
Takashi Iwai |
e5b442 |
Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>
|
|
Takashi Iwai |
e5b442 |
Cc: stable <stable@vger.kernel.org>
|
|
Takashi Iwai |
e5b442 |
Fixes: 248b57015f35 ("leds: lp5523: fix a missing check of return value of lp55xx_read")
|
|
Takashi Iwai |
e5b442 |
Link: https://lore.kernel.org/r/20210503115736.2104747-9-gregkh@linuxfoundation.org
|
|
Takashi Iwai |
e5b442 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Takashi Iwai |
e5b442 |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
---
|
|
Takashi Iwai |
e5b442 |
drivers/leds/leds-lp5523.c | 4 +---
|
|
Takashi Iwai |
e5b442 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
|
|
Takashi Iwai |
e5b442 |
index fc433e63b1dc..5036d7d5f3d4 100644
|
|
Takashi Iwai |
e5b442 |
--- a/drivers/leds/leds-lp5523.c
|
|
Takashi Iwai |
e5b442 |
+++ b/drivers/leds/leds-lp5523.c
|
|
Takashi Iwai |
e5b442 |
@@ -305,9 +305,7 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip)
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
/* Let the programs run for couple of ms and check the engine status */
|
|
Takashi Iwai |
e5b442 |
usleep_range(3000, 6000);
|
|
Takashi Iwai |
e5b442 |
- ret = lp55xx_read(chip, LP5523_REG_STATUS, &status);
|
|
Takashi Iwai |
e5b442 |
- if (ret)
|
|
Takashi Iwai |
e5b442 |
- return ret;
|
|
Takashi Iwai |
e5b442 |
+ lp55xx_read(chip, LP5523_REG_STATUS, &status);
|
|
Takashi Iwai |
e5b442 |
status &= LP5523_ENG_STATUS_MASK;
|
|
Takashi Iwai |
e5b442 |
|
|
Takashi Iwai |
e5b442 |
if (status != LP5523_ENG_STATUS_MASK) {
|
|
Takashi Iwai |
e5b442 |
--
|
|
Takashi Iwai |
e5b442 |
2.26.2
|
|
Takashi Iwai |
e5b442 |
|