diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-04-28 13:45:31 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-04-28 13:45:31 -0400 |
| commit | 344284eab562fa69e9c0c0f45c79d7227f5f2858 (patch) | |
| tree | 05928aace65aef5390d34bb8e4752c646954c4db /drivers/leds | |
| parent | d26b2fc5c0474086af79d33554a133247e8e69c3 (diff) | |
| parent | 19bb613acb9ad8e57593cad5118acaee117cc303 (diff) | |
Merge tag 'v4.19.37' into v4.19-rt
This is the 4.19.37 stable release
Conflicts:
include/linux/sched/mm.h
kernel/sched/fair.c
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-lp55xx-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c index 3d79a6380761..723f2f17497a 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -201,7 +201,7 @@ static void lp55xx_firmware_loaded(const struct firmware *fw, void *context) if (!fw) { dev_err(dev, "firmware request failed\n"); - goto out; + return; } /* handling firmware data is chip dependent */ @@ -214,9 +214,9 @@ static void lp55xx_firmware_loaded(const struct firmware *fw, void *context) mutex_unlock(&chip->lock); -out: /* firmware should be released for other channel use */ release_firmware(chip->fw); + chip->fw = NULL; } static int lp55xx_request_firmware(struct lp55xx_chip *chip) |