From f12f0b1d3fdb5acbe1490c0cbf086a7b250e0d12 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Sun, 14 May 2017 15:23:57 +0300 Subject: [PATCH 014/122] Revert "[media] v4l2-async: remove unneeded .registered_async callback" This reverts commit a53d2f299dc83340c695e153363a2f21641d5f58. --- drivers/media/v4l2-core/v4l2-async.c | 4 ++++ include/media/v4l2-subdev.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index a7c3464..7b6c556 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -225,6 +225,10 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, /* Move from the global subdevice list to notifier's done */ list_move(&sd->async_list, ¬ifier->done); + ret = v4l2_subdev_call(sd, core, registered_async); + if (ret < 0 && ret != -ENOIOCTLCMD) + return ret; + /* * See if the sub-device has a notifier. If not, return here. */ diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index ec399c7..c7f2a77 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -184,6 +184,8 @@ struct v4l2_subdev_io_pin_config { * for it to be warned when the value of a control changes. * * @unsubscribe_event: remove event subscription from the control framework. + * + * @registered_async: the subdevice has been registered async. */ struct v4l2_subdev_core_ops { int (*log_status)(struct v4l2_subdev *sd); @@ -209,6 +211,7 @@ struct v4l2_subdev_core_ops { struct v4l2_event_subscription *sub); int (*unsubscribe_event)(struct v4l2_subdev *sd, struct v4l2_fh *fh, struct v4l2_event_subscription *sub); + int (*registered_async)(struct v4l2_subdev *sd); }; /** -- 2.7.4