diff options
| author | Liu Ying <Ying.Liu@freescale.com> | 2013-07-10 10:56:45 +0800 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2013-07-10 15:12:41 +0800 |
| commit | b3c23e81079a2758863055905ac359c38d69e254 (patch) | |
| tree | 6ee38d0f1bbaa0f219d2a35aa660e71c66d23890 | |
| parent | bf0aaca72f76175682ae74e2177b0494e9a1a19b (diff) | |
ENGR00255920-1 mxc vout:Remove cancel_work_sync() when streamoff
We hope the queued works can be done before streamoff, since the
works will render expiring video buffers to display. But, the
function cancel_work_sync() cannot guarantee this. Instead, it
may cancel some queued works before they starts to work. This
patch removes the function call cancel_work_sync() when streamoff.
We rely on the function flush_workqueue() right after it to make
sure queued works be done before streamoff.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
(cherry picked from commit d88f6f7eaf3b78e667de46aa355cf366a1142e47)
| -rw-r--r-- | drivers/media/video/mxc/output/mxc_vout.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/mxc/output/mxc_vout.c b/drivers/media/video/mxc/output/mxc_vout.c index e0840bf7a1c2..622042c73d41 100644 --- a/drivers/media/video/mxc/output/mxc_vout.c +++ b/drivers/media/video/mxc/output/mxc_vout.c @@ -1922,7 +1922,6 @@ static int mxc_vidioc_streamoff(struct file *file, void *fh, int ret = 0; if (q->streaming) { - cancel_work_sync(&vout->disp_work); flush_workqueue(vout->v4l_wq); hrtimer_cancel(&vout->timer); |