]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
greybus: lights: add v4l2 flash operations
authorRui Miguel Silva <rui.silva@linaro.org>
Thu, 3 Dec 2015 16:07:47 +0000 (16:07 +0000)
committerGreg Kroah-Hartman <gregkh@google.com>
Thu, 3 Dec 2015 23:33:34 +0000 (15:33 -0800)
We do not implement any of the v4l2 flash operations, as the default
ones are ok for now, however the init needs anything define, if not it
will return an error. So, just define it and have an error free v4l2
flash init.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/light.c

index 3723a2ce29b3763add47241561326d76e92982f7..01dcf18c96011b1bca7b4734849850da0ff69b6c 100644 (file)
@@ -456,6 +456,8 @@ static void gb_lights_led_operations_set(struct gb_channel *channel,
 
 #ifdef V4L2_HAVE_FLASH
 /* V4L2 specific helpers */
+static const struct v4l2_flash_ops v4l2_flash_ops;
+
 static void __gb_lights_channel_v4l2_config(struct led_flash_setting *channel_s,
                                            struct led_flash_setting *v4l2_s)
 {
@@ -507,7 +509,7 @@ static int gb_lights_light_v4l2_register(struct gb_light *light)
                LED_FAULT_LED_OVER_TEMPERATURE;
 
        light->v4l2_flash = v4l2_flash_init(dev, NULL, fled, iled,
-                                           NULL, sd_cfg);
+                                           &v4l2_flash_ops, sd_cfg);
        if (IS_ERR_OR_NULL(light->v4l2_flash)) {
                ret = PTR_ERR(light->v4l2_flash);
                goto out_free;