From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932438AbcEKJYk (ORCPT ); Wed, 11 May 2016 05:24:40 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:53947 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932202AbcEKJYg (ORCPT ); Wed, 11 May 2016 05:24:36 -0400 From: Alban Bedel To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Sakari Ailus , Javier Martinez Canillas , Laurent Pinchart , linux-kernel@vger.kernel.org, Alban Bedel Subject: [PATCH v2] [media] v4l2-async: Pass the v4l2_async_subdev to the unbind callback Date: Wed, 11 May 2016 11:24:04 +0200 Message-Id: <1462958644-3521-1-git-send-email-alban.bedel@avionic-design.de> X-Mailer: git-send-email 2.8.2 X-Provags-ID: V03:K0:kU9aXbnQD1ScP2pb7GZps7ow7MnihB8IpTfJx/4g4jIc48WJls1 ZgTNfpeEuHeh1zSU1GWuub6No1GCcfX0hP7q/MNrEB3WimUAYCP8QlYlQM7O5os1WE5pEnE r49484dUHwC6cw3JjpyyrbRcw1xnbWPDhGcaHZA3QX/n8aFSGGCxL0SK4yyUnMt6OgivGso cr34q5v0ULQnEiphTlVSA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Hiy9t60TssA=:lAB/Xe9ur59CqsVR1W/v/J qGKfaO6ODZW875g6hYldWEn30CpL/2UH/YWplMKmvoN9Di/IoJK1R6kAKxnsrYLpNEck0SZgN YTY5k/0jrm7w4brtb9GUebpvKRNUBKZJ7zvMwD+qtbF4FIGoIRzLyhwJ1E2hmsYinoFMgoRoU qulRgfdPZ0bX/7kE5H67r+io4JZAB6n0zXHTdnXZ9XpnT7aOacPN/a0FI7uNVRa0pxTC0GzXZ k3h5u+ekFdQX4j+AEyNaFzqPjn3h720MdHEq5kH7+JBVMqKPtx3P5xMld9UpXb4NQSF7MZt0j dAMyaxubMR46JS/Br2lenixeXTH8PGMzMwfB0U00RFd29mlwlg6ESecJykyuB2YBm7XZ7amez gilEFrmQUeMw9jOj+3YLAXUiVbVtgyWBCAJsz4KSfhBxE66NZpWPDdkTMAAhq0pl4r1LcByfR GqnEFntjupZxtV0A249BrqcuuznXxqZ9mR96FkayS1j5Vota0kHFMh/kdlL8V/vHdCnqUj4mk BI/Pe2AodkfyCaYqG5MQDnyVkWQPycFZJZNmL2/yrgpoKa5Yovq3Xfm7kYhGAbl3JI0i53+Gj W4d0l7MliBPfVNUgsKd0qXtgC76s2/UcdWOkFfhTyw7CjFIIys45W/Ag2eW/jNHnd/sbvoD6U mEi4DGmGelkIRWxyW0oLYnRbJIk8z3jNOiGAMufyZPyFymOeRYgBSQnBdDhK3An1cqXM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org v4l2_async_cleanup() is always called before calling the unbind() callback. However v4l2_async_cleanup() clears 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 Acked-by: Sakari Ailus Reviewed-by: Javier Martinez Canillas --- 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(¬ifier->list); list_for_each_entry_safe(sd, tmp, ¬ifier->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