summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2013-10-22 18:30:27 +0530
committerHarry Hong <hhong@nvidia.com>2014-01-12 16:53:39 -0800
commitd992ac22487a3d2c66fe7fbd174dcbd2f9613b85 (patch)
treee95747b88035bb35e90f0710e3200ffdf47e415f /drivers
parent7c4fe0ff9a7a338ba08d3b2e790b7b94421220e6 (diff)
video: tegra: dc: use cancel_delayed_work_sync()
- nvhdcp driver uses flush_workqueue() - instead make use of cancel_delayed_work_sync() since work scheduled is delayed work Bug 1308191 Change-Id: I40f841c417cda9b6f40bb9da5c86c0b8944807e9 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/302383 (cherry picked from commit 058f6085fe89ba3eb4f8cececa42af3dc781c084) Reviewed-on: http://git-master/r/353592 Reviewed-by: Harry Hong <hhong@nvidia.com> Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/tegra/dc/nvhdcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c
index 443b3dd8d39f..a4ca44c97839 100644
--- a/drivers/video/tegra/dc/nvhdcp.c
+++ b/drivers/video/tegra/dc/nvhdcp.c
@@ -1,7 +1,7 @@
/*
* drivers/video/tegra/dc/nvhdcp.c
*
- * Copyright (c) 2010-2013, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2010-2014, NVIDIA CORPORATION, All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -1078,7 +1078,7 @@ static int tegra_nvhdcp_off(struct tegra_nvhdcp *nvhdcp)
nvhdcp->state = STATE_OFF;
mutex_unlock(&nvhdcp->lock);
wake_up_interruptible(&wq_worker);
- flush_workqueue(nvhdcp->downstream_wq);
+ cancel_delayed_work_sync(&nvhdcp->work);
return 0;
}