Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3da7ee94 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: vimc: fix control event handling 



The sensor subdev didn't handle control events. Add support for this.
Found with v4l2-compliance.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 876e32e5

drivers/media/platform/vimc/vimc-common.c

+3 −1
Original line number Diff line number Diff line
@@ -434,7 +434,9 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved, 
	v4l2_set_subdevdata(sd, ved);



	/* Expose this subdev to user space */

	sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE;

	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	if (sd->ctrl_handler)

		sd->flags |= V4L2_SUBDEV_FL_HAS_EVENTS;



	/* Initialize the media entity */

	ret = media_entity_pads_init(&sd->entity, num_pads, ved->pads);

drivers/media/platform/vimc/vimc-sensor.c

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/v4l2-mediabus.h>

#include <linux/vmalloc.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-event.h>

#include <media/v4l2-subdev.h>

#include <media/tpg/v4l2-tpg.h>
@@ -284,11 +285,18 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable) 
	return 0;

}



static struct v4l2_subdev_core_ops vimc_sen_core_ops = {

	.log_status = v4l2_ctrl_subdev_log_status,

	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,

	.unsubscribe_event = v4l2_event_subdev_unsubscribe,

};



static const struct v4l2_subdev_video_ops vimc_sen_video_ops = {

	.s_stream = vimc_sen_s_stream,

};



static const struct v4l2_subdev_ops vimc_sen_ops = {

	.core = &vimc_sen_core_ops,

	.pad = &vimc_sen_pad_ops,

	.video = &vimc_sen_video_ops,

};