From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752477AbcEJNTq (ORCPT ); Tue, 10 May 2016 09:19:46 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:56457 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752439AbcEJNTn (ORCPT ); Tue, 10 May 2016 09:19:43 -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] [media] v4l2-async: Pass the v4l2_async_subdev to the unbind callback Date: Tue, 10 May 2016 15:19:14 +0200 Message-Id: <1462886354-2115-1-git-send-email-alban.bedel@avionic-design.de> X-Mailer: git-send-email 2.8.2 X-Provags-ID: V03:K0:nRhcRGwhXB2AX+N+L7JAZL46cNf200DljdDu/fkFuFEQW9XWbNi 8EnEvsV2rh9zArPQiKjfj+IZIRpLAnQ3GK2ndN64K+S92Q6jUUk8sOT8ZkuqnbR9nlIPmgF aMp7nqWBJ+ZyBUNVl+7TGpH9hl2CX8GDdIb42DCqsh/ZYzoH8V9CEZtKtwrEzdEOASh74XO yAqkMicpq5LagvGQZHp/g== X-UI-Out-Filterresults: notjunk:1;V01:K0:1n+XDSQBOik=:SXrBfCfqpmS1gheii9ewAI ZLGesRVif1WOKPLO4bhAPKMpPydY2vAafFS2Q/NYh+HRneDR12Ml7qGNnj8VPbrFFTyyAIWhr E4lrRwnCq6zmTtGbNwoNYUuIN0tcw3OBscVaJcaNKmExEnv/ov6/B0vYuKCRxmrrT+wqVuv+w S0ngqxAD+wQk6VCrRyMkux7UAgl8Vsta6dwI48eIwzEP9q8gJn+ll8CoD2BqCJU0E02xRRaVr wrZKkD4OBP2iT9MLBUmsBP1DrwvVkh2UTGa1UMz9qxFt2AgCkK9AK2MF7GVSssEbdXhOPyfo0 7jtDfZ8dYccGNZgob0R2MeF2jdCm4ksMczAoOuSsnlYyhHRrpROoLohMOlYenBMjmnH+Hrja4 JdsTp/DegE9iSeqwMK22R0rxW3nC6EkS0HZzdANCoXPkiTjtCavu6cGBK3LtTR4ziINi6+mAT GmKk6lNPQqdD3u2nGUjxvalP1NpfFTE9X4tpJRQXCaiMaLM4Dsnar8SGLt2PaoZDsp7kq9M26 2hp5nhpy6ZNxCgMDaAcTT9iRyXeclq3WY/xJhb0Z74h5xEA/hPifqA5Hy2NAf+/K7/9L78h4T Zj5naZ4JLmoonMxYDkYTPS2Ht+GfNqjLC4IEGzwxbO/H07luS98QAb+W2PRYDxxRxWWIGppGd N2VuEDiWS5d/3YQPn3TBucZcAeZ+2gneQPssOnSM0TqZNX4xN1HDSBxvQPMPFLIGz34U= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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