summaryrefslogtreecommitdiffstats
path: root/drivers/platform/tegra/rtcpu
diff options
context:
space:
mode:
authorPekka Pessi <ppessi@nvidia.com>2018-08-20 17:53:51 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-10 18:04:32 -0400
commit9558a1543cfb2e3534d0e8b8fb32ec6fde5ae70c (patch)
tree6b3ede097fde4e28b4739d20e53e72bd56c3fccc /drivers/platform/tegra/rtcpu
parent605698328798c7736da9b8f0aedb36aaa2dd9f52 (diff)
tegra: capture-ivc: cancel work before removing
Prevent channel from being removed while there are scheduled work. Bug 2305627 Change-Id: Ia64ccb86f3fde9984f46ace93a2ceed024192701 Signed-off-by: Pekka Pessi <ppessi@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1803897 Reviewed-by: Semi Malinen <smalinen@nvidia.com> Reviewed-by: Bhanu Murthy V <bmurthyv@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/platform/tegra/rtcpu')
-rw-r--r--drivers/platform/tegra/rtcpu/capture-ivc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/tegra/rtcpu/capture-ivc.c b/drivers/platform/tegra/rtcpu/capture-ivc.c
index f9fc17b73..b3132029f 100644
--- a/drivers/platform/tegra/rtcpu/capture-ivc.c
+++ b/drivers/platform/tegra/rtcpu/capture-ivc.c
@@ -471,6 +471,8 @@ static void tegra_capture_ivc_remove(struct tegra_ivc_channel *chan)
471{ 471{
472 struct tegra_capture_ivc *civc = tegra_ivc_channel_get_drvdata(chan); 472 struct tegra_capture_ivc *civc = tegra_ivc_channel_get_drvdata(chan);
473 473
474 cancel_work_sync(&civc->work);
475
474 if (__scivc_control == civc) 476 if (__scivc_control == civc)
475 __scivc_control = NULL; 477 __scivc_control = NULL;
476 else if (__scivc_capture == civc) 478 else if (__scivc_capture == civc)