diff options
author | Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> | 2017-10-02 16:16:52 -0400 |
---|---|---|
committer | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2019-05-01 11:51:31 +0100 |
commit | 759d496fc096c1e2d0426ef55dd3f1b933f2cb71 (patch) | |
tree | c527ba63009992b36ffa57b509568ba2421ce703 | |
parent | 2ab5fcb0c7e6386b819707eae7e48147f399521e (diff) |
media: v4l: async: fix unbind error in v4l2_async_notifier_unregister()
The call to v4l2_async_cleanup() will set sd->asd to NULL so passing it to
notifier->unbind() has no effect and leaves the notifier confused. Call
the unbind() callback prior to cleaning up the subdevice to avoid this.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
-rw-r--r-- | drivers/media/v4l2-core/v4l2-async.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index 21c748bf3a7b..ca281438a0ae 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -206,11 +206,11 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier) list_del(¬ifier->list); list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) { - v4l2_async_cleanup(sd); - if (notifier->unbind) notifier->unbind(notifier, sd, sd->asd); + v4l2_async_cleanup(sd); + list_move(&sd->async_list, &subdev_list); } @@ -268,11 +268,11 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd) list_add(&sd->asd->list, ¬ifier->waiting); - v4l2_async_cleanup(sd); - if (notifier->unbind) notifier->unbind(notifier, sd, sd->asd); + v4l2_async_cleanup(sd); + mutex_unlock(&list_lock); } EXPORT_SYMBOL(v4l2_async_unregister_subdev); |