]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: dc: use cancel_delayed_work_sync()
authorDeepak Nibade <dnibade@nvidia.com>
Tue, 22 Oct 2013 13:00:27 +0000 (18:30 +0530)
committerBharat Nihalani <bnihalani@nvidia.com>
Fri, 8 Nov 2013 08:40:53 +0000 (00:40 -0800)
- 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
Reviewed-on: http://git-master/r/303810
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
drivers/video/tegra/dc/nvhdcp.c

index ddd266dcedb366993579c0cb8457406f74b86f68..991832fccd8e2abb2ece2b664fbea26431611118 100644 (file)
@@ -1075,8 +1075,7 @@ static int tegra_nvhdcp_off(struct tegra_nvhdcp *nvhdcp)
        nvhdcp_set_plugged(nvhdcp, false);
        mutex_unlock(&nvhdcp->lock);
        wake_up_interruptible(&wq_worker);
-       flush_workqueue(nvhdcp->downstream_wq);
-       msleep(1000);
+       cancel_delayed_work_sync(&nvhdcp->work);
        return 0;
 }