openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: lights: add v4l2 flash operations 

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>
This commit is contained in:
Rui Miguel Silva 2015-12-03 16:07:47 +00:00 committed by Greg Kroah-Hartman
parent e6420dac3d
commit 3f85c787b7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/greybus/light.c
View 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;