shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: v4l: async: Return async sub-devices to subnotifier list

Browse Source 
[ Upstream commit 5276c9df9c ]

When an async notifier is unregistered, the async sub-devices in the
notifier's done list will disappear with the notifier. However this is
currently also done to the sub-notifiers that remain registered. Their
sub-devices only need to be unbound while the async sub-devices themselves
need to be returned to the sub-notifier's waiting list. Do this now.

Fixes: 2cab00bb07 ("media: v4l: async: Allow binding notifiers to sub-devices")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sakari Ailus
2023-03-07 15:49:44 +02:00
committed by Greg Kroah-Hartman
parent 45b7461d91
commit 893b267ccc
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/v4l2-core/v4l2-async.c
View File

@@ -414,7 +414,8 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
/* Unbind all sub-devices in the notifier tree. */ /* Unbind all sub-devices in the notifier tree. */
static void static void
v4l2_async_nf_unbind_all_subdevs(struct v4l2_async_notifier *notifier) v4l2_async_nf_unbind_all_subdevs(struct v4l2_async_notifier *notifier,
bool readd)
{ {
struct v4l2_subdev *sd, *tmp; struct v4l2_subdev *sd, *tmp;
@@ -423,9 +424,11 @@ v4l2_async_nf_unbind_all_subdevs(struct v4l2_async_notifier *notifier)
v4l2_async_find_subdev_notifier(sd); v4l2_async_find_subdev_notifier(sd);
if (subdev_notifier) if (subdev_notifier)
v4l2_async_nf_unbind_all_subdevs(subdev_notifier); v4l2_async_nf_unbind_all_subdevs(subdev_notifier, true);
v4l2_async_nf_call_unbind(notifier, sd, sd->asd); v4l2_async_nf_call_unbind(notifier, sd, sd->asd);
if (readd)
list_add_tail(&sd->asd->list, &notifier->waiting);
v4l2_async_cleanup(sd); v4l2_async_cleanup(sd);
list_move(&sd->async_list, &subdev_list); list_move(&sd->async_list, &subdev_list);
@@ -557,7 +560,7 @@ err_unbind:
/* /*
* On failure, unbind all sub-devices registered through this notifier. * On failure, unbind all sub-devices registered through this notifier.
*/ */
v4l2_async_nf_unbind_all_subdevs(notifier); v4l2_async_nf_unbind_all_subdevs(notifier, false);
err_unlock: err_unlock:
mutex_unlock(&list_lock); mutex_unlock(&list_lock);
@@ -607,7 +610,7 @@ __v4l2_async_nf_unregister(struct v4l2_async_notifier *notifier)
if (!notifier || (!notifier->v4l2_dev && !notifier->sd)) if (!notifier || (!notifier->v4l2_dev && !notifier->sd))
return; return;
v4l2_async_nf_unbind_all_subdevs(notifier); v4l2_async_nf_unbind_all_subdevs(notifier, false);
notifier->sd = NULL; notifier->sd = NULL;
notifier->v4l2_dev = NULL; notifier->v4l2_dev = NULL;
@@ -805,7 +808,7 @@ err_unbind:
*/ */
subdev_notifier = v4l2_async_find_subdev_notifier(sd); subdev_notifier = v4l2_async_find_subdev_notifier(sd);
if (subdev_notifier) if (subdev_notifier)
v4l2_async_nf_unbind_all_subdevs(subdev_notifier); v4l2_async_nf_unbind_all_subdevs(subdev_notifier, false);
if (sd->asd) if (sd->asd)
v4l2_async_nf_call_unbind(notifier, sd, sd->asd); v4l2_async_nf_call_unbind(notifier, sd, sd->asd);