mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

greybus: lights: fix check for configured lights

Browse source 
The validation for a complete configured light is wrong and it is
reworked to make sure that only when the light is ready, will handle
request events.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Reported-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Rui Miguel Silva 2016-02-17 14:32:53 +00:00 committed by Greg Kroah-Hartman
parent 137f717942
commit c6ad27a98c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/greybus/light.c
View file

@ -55,6 +55,7 @@ struct gb_light {
u8 channels_count;
struct gb_channel *channels;
bool has_flash;
bool ready;
#ifdef V4L2_HAVE_FLASH
struct v4l2_flash *v4l2_flash;
#endif
@ -1002,6 +1003,8 @@ static int gb_lights_light_register(struct gb_light *light)
return ret;
}
light->ready = true;
if (light->has_flash) {
ret = gb_lights_light_v4l2_register(light);
if (ret < 0) {
@ -1040,6 +1043,7 @@ static void gb_lights_light_release(struct gb_light *light)
int i;
int count;
light->ready = false;
count = light->channels_count;
@ -1174,7 +1178,8 @@ static int gb_lights_request_handler(struct gb_operation *op)
payload = request->payload;
light_id = payload->light_id;
if (light_id >= glights->lights_count || !&glights->lights[light_id]) {
if (light_id >= glights->lights_count || !glights->lights ||
!glights->lights[light_id].ready) {
dev_err(dev, "Event received for unconfigured light id: %d\n",
light_id);
return -EINVAL;