提交 5c6e86bf 编写于 作者: G Greg Kroah-Hartman 提交者: Yang Yingliang

Revert "leds: lp5523: fix a missing check of return value of lp55xx_read"

stable inclusion
from linux-4.19.192
commit f7bce372a9e415990c6b9852febc7fb0ffc93729

--------------------------------

commit 8d1beda5 upstream.

This reverts commit 248b5701.

Because of recent interactions with developers from @umn.edu, all
commits from them have been recently re-reviewed to ensure if they were
correct or not.

Upon review, this commit was found to be incorrect for the reasons
below, so it must be reverted.  It will be fixed up "correctly" in a
later kernel change.

The original commit does not properly unwind if there is an error
condition so it needs to be reverted at this point in time.

Cc: Kangjie Lu <kjlu@umn.edu>
Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: stable <stable@vger.kernel.org>
Fixes: 248b5701 ("leds: lp5523: fix a missing check of return value of lp55xx_read")
Link: https://lore.kernel.org/r/20210503115736.2104747-9-gregkh@linuxfoundation.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 d3ec275f
...@@ -318,9 +318,7 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip) ...@@ -318,9 +318,7 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip)
/* Let the programs run for couple of ms and check the engine status */ /* Let the programs run for couple of ms and check the engine status */
usleep_range(3000, 6000); usleep_range(3000, 6000);
ret = lp55xx_read(chip, LP5523_REG_STATUS, &status); lp55xx_read(chip, LP5523_REG_STATUS, &status);
if (ret)
return ret;
status &= LP5523_ENG_STATUS_MASK; status &= LP5523_ENG_STATUS_MASK;
if (status != LP5523_ENG_STATUS_MASK) { if (status != LP5523_ENG_STATUS_MASK) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册