leds: flash: leds-qcom-flash: Test the correct variable in init
Subsystems (2)
PATCH 1/1 leds: flash: leds-qcom-flash: Test the correct variable in init
This code was passing the incorrect pointer to PTR_ERR_OR_ZERO() so it always returned success. It should have been checking the array element instead of the array itself.
Fixes 96a2e242a5dc ("leds: flash: Add driver to support flash LED module in QCOM PMICs")
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/leds/flash/leds-qcom-flash.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/leds/flash/leds-qcom-flash.c +7 -3
@@ -505,6 +505,7 @@ qcom_flash_v4l2_init(struct device *dev, struct qcom_flash_led *led, struct fwnostruct qcom_flash_data *flash_data = led->flash_data;struct v4l2_flash_config v4l2_cfg = {0 };struct led_flash_setting *intensity = &v4l2_cfg.intensity; +struct v4l2_flash *v4l2_flash;if (!(led->flash.led_cdev.flags &LED_DEV_CAP_FLASH ))return 0 ;
@@ -523,9 +524,12 @@ qcom_flash_v4l2_init(struct device *dev, struct qcom_flash_led *led, struct fwnoLED_FAULT_OVER_TEMPERATURE |LED_FAULT_TIMEOUT ; - flash_data->v4l2_flash[flash_data->leds_count] = -v4l2_flash_init (dev, fwnode, &led->flash, &qcom_v4l2_flash_ops, &v4l2_cfg); -return PTR_ERR_OR_ZERO (flash_data->v4l2_flash); + v4l2_flash =v4l2_flash_init (dev, fwnode, &led->flash, &qcom_v4l2_flash_ops, &v4l2_cfg); +if (IS_ERR (v4l2_flash)) +return PTR_ERR (v4l2_flash); + + flash_data->v4l2_flash[flash_data->leds_count] = v4l2_flash; +return 0 ; }# else static int
Signature · 1 line
2.43.0
Re: (subset) [PATCH] leds: flash: leds-qcom-flash: Test the correct variable in init
Quoted 5 lines · Dan Carpenter
This code was passing the incorrect pointer to
PTR_ERR_OR_ZERO()so it always returned success. It should have been checking the array element instead of the array itself.
Applied, thanks!
[1/1] leds: flash: leds-qcom-flash: Test the correct variable in init
commit: b9bd590268485652b928110b5543057543b5d02b
--
Lee Jones [李琼斯]