| Message ID | 20210503115736.2104747-10-gregkh@linuxfoundation.org |
|---|---|
| State | Accepted |
| Commit | 6647f7a06eb030a2384ec71f0bb2e78854afabfe |
| Headers | show |
| Series | None | expand |
On Mon, May 03, 2021 at 09:36:14PM +0200, Jacek Anaszewski wrote: > On 5/3/21 1:56 PM, Greg Kroah-Hartman wrote: > > From: Phillip Potter <phil@philpotter.co.uk> > > > > 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: Jacek Anaszewski <jacek.anaszewski@gmail.com> > > Cc: stable <stable@vger.kernel.org> > > Signed-off-by: Phillip Potter <phil@philpotter.co.uk> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > --- > > drivers/leds/leds-lp5523.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > 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) { > > > > Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> Thanks for the review!
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) {