diff options
author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2017-06-02 05:30:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-07-26 08:40:28 -0400 |
commit | 85f7ff9702bcc5e899bd0bf6b6e383ecb2ac436a (patch) | |
tree | ed7326d7e0b0fc51caa38706b9ded4bc772ab310 /drivers/staging | |
parent | 06f8152027765e55da3afc23d87c5fdaf9e7a686 (diff) | |
download | linux-stable-85f7ff9702bcc5e899bd0bf6b6e383ecb2ac436a.tar.gz linux-stable-85f7ff9702bcc5e899bd0bf6b6e383ecb2ac436a.tar.bz2 linux-stable-85f7ff9702bcc5e899bd0bf6b6e383ecb2ac436a.zip |
media: v4l2-flash: Use led_classdev instead of led_classdev_flash for indicator
The V4L2 flash class initialisation expects struct led_classdev_flash that
describes an indicator but only uses struct led_classdev which is a field
iled_cdev in the struct. Use struct iled_cdev only.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/greybus/light.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index 861a249e6ef1..129ceed39829 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -536,7 +536,7 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) struct device *dev = &connection->bundle->dev; struct v4l2_flash_config *sd_cfg; struct led_classdev_flash *fled; - struct led_classdev_flash *iled = NULL; + struct led_classdev *iled = NULL; struct gb_channel *channel_torch, *channel_ind, *channel_flash; int ret = 0; @@ -553,7 +553,7 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) if (channel_ind) { __gb_lights_channel_v4l2_config(&channel_ind->intensity_uA, &sd_cfg->indicator_intensity); - iled = &channel_ind->fled; + iled = &channel_ind->fled.led_cdev; } channel_flash = get_channel_from_mode(light, GB_CHANNEL_MODE_FLASH); |