[PATCH] [media] v4l2-async: Pass the v4l2_async_subdev to the unbind callback

[PATCH] [media] v4l2-async: Pass the v4l2_async_subdev to the unbind callback

[Alban Bedel]

v4l2_async_cleanup() is always called before before calling the
unbind() callback. However v4l2_async_cleanup() clear the asd member,
so when calling the unbind() callback the v4l2_async_subdev is always
NULL. To fix this save the asd before calling v4l2_async_cleanup().

Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
---
 drivers/media/v4l2-core/v4l2-async.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index a4b224d..ceb28d4 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -220,6 +220,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
 	list_del(&notifier->list);
 
 	list_for_each_entry_safe(sd, tmp, &notifier->done, async_list) {
+		struct v4l2_async_subdev *asd = sd->asd;
 		struct device *d;
 
 		d = get_device(sd->dev);
@@ -230,7 +231,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
 		device_release_driver(d);
 
 		if (notifier->unbind)
-			notifier->unbind(notifier, sd, sd->asd);
+			notifier->unbind(notifier, sd, asd);
 
 		/*
 		 * Store device at the device cache, in order to call
@@ -313,6 +314,7 @@ EXPORT_SYMBOL(v4l2_async_register_subdev);
 void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
 {
 	struct v4l2_async_notifier *notifier = sd->notifier;
+	struct v4l2_async_subdev *asd = sd->asd;
 
 	if (!sd->asd) {
 		if (!list_empty(&sd->async_list))
@@ -327,7 +329,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
 	v4l2_async_cleanup(sd);
 
 	if (notifier->unbind)
-		notifier->unbind(notifier, sd, sd->asd);
+		notifier->unbind(notifier, sd, asd);
 
 	mutex_unlock(&list_lock);
 }
-- 
2.8.2

Re: [PATCH] [media] v4l2-async: Pass the v4l2_async_subdev to the unbind callback

[Sakari Ailus]

Hi Alban,

On Tue, May 10, 2016 at 03:19:14PM +0200, Alban Bedel wrote:
> v4l2_async_cleanup() is always called before before calling the

s/before //

> unbind() callback. However v4l2_async_cleanup() clear the asd member,

s/clear/clears/

> so when calling the unbind() callback the v4l2_async_subdev is always
> NULL. To fix this save the asd before calling v4l2_async_cleanup().

Oh dear...! How could this have happened? :-o

With the commit message changes,

Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>

> 
> Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
> ---
>  drivers/media/v4l2-core/v4l2-async.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index a4b224d..ceb28d4 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -220,6 +220,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
>  	list_del(&notifier->list);
>  
>  	list_for_each_entry_safe(sd, tmp, &notifier->done, async_list) {
> +		struct v4l2_async_subdev *asd = sd->asd;
>  		struct device *d;
>  
>  		d = get_device(sd->dev);
> @@ -230,7 +231,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
>  		device_release_driver(d);
>  
>  		if (notifier->unbind)
> -			notifier->unbind(notifier, sd, sd->asd);
> +			notifier->unbind(notifier, sd, asd);
>  
>  		/*
>  		 * Store device at the device cache, in order to call
> @@ -313,6 +314,7 @@ EXPORT_SYMBOL(v4l2_async_register_subdev);
>  void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
>  {
>  	struct v4l2_async_notifier *notifier = sd->notifier;
> +	struct v4l2_async_subdev *asd = sd->asd;
>  
>  	if (!sd->asd) {
>  		if (!list_empty(&sd->async_list))
> @@ -327,7 +329,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
>  	v4l2_async_cleanup(sd);
>  
>  	if (notifier->unbind)
> -		notifier->unbind(notifier, sd, sd->asd);
> +		notifier->unbind(notifier, sd, asd);
>  
>  	mutex_unlock(&list_lock);
>  }

-- 
Kind regards,

Sakari Ailus
e-mail: sakari.ailus@iki.fi	XMPP: sailus@retiisi.org.uk

Re: [PATCH] [media] v4l2-async: Pass the v4l2_async_subdev to the unbind callback

[Javier Martinez Canillas]

Hello Alban,

On 05/10/2016 09:19 AM, Alban Bedel wrote:
> v4l2_async_cleanup() is always called before before calling the
> unbind() callback. However v4l2_async_cleanup() clear the asd member,
> so when calling the unbind() callback the v4l2_async_subdev is always
> NULL. To fix this save the asd before calling v4l2_async_cleanup().
> 
> Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
> ---

Patch looks good to me. So after fixing the issues pointed out by Sakari:

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America