Merge tag 'leds_for_4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszews...

[sfrench/cifs-2.6.git] / drivers / leds / leds-max77693.c

diff --git a/drivers/leds/leds-max77693.c b/drivers/leds/leds-max77693.c
index 2d3062d53325aa43257ee8387b110f7db2c9e4ef..adf0f191f7946ed43916e5158031e16a20429932 100644 (file)
--- a/drivers/leds/leds-max77693.c
+++ b/drivers/leds/leds-max77693.c
@@ -856,7 +856,7 @@ static void max77693_init_v4l2_flash_config(struct max77693_sub_led *sub_led,
                 "%s %d-%04x", sub_led->fled_cdev.led_cdev.name,
                 i2c_adapter_id(i2c->adapter), i2c->addr);
 
-       s = &v4l2_sd_cfg->torch_intensity;
+       s = &v4l2_sd_cfg->intensity;
        s->min = TORCH_IOUT_MIN;
        s->max = sub_led->fled_cdev.led_cdev.max_brightness * TORCH_IOUT_STEP;
        s->step = TORCH_IOUT_STEP;
@@ -931,7 +931,7 @@ static int max77693_register_led(struct max77693_sub_led *sub_led,
 
        /* Register in the V4L2 subsystem. */
        sub_led->v4l2_flash = v4l2_flash_init(dev, of_fwnode_handle(sub_node),
-                                             fled_cdev, NULL, &v4l2_flash_ops,
+                                             fled_cdev, &v4l2_flash_ops,
                                              &v4l2_sd_cfg);
        if (IS_ERR(sub_led->v4l2_flash)) {
                ret = PTR_ERR(sub_led->v4l2_flash);