diff options
| author | Liu Ying <Ying.Liu@freescale.com> | 2013-09-12 15:50:13 +0800 |
|---|---|---|
| committer | Liu Ying <Ying.Liu@freescale.com> | 2013-09-12 17:08:41 +0800 |
| commit | 9abfb2f8057d80f7f7ce1c79c37f4b4c48eecc75 (patch) | |
| tree | d181ce009ca3500a3ab662f23e99733932c81eeb | |
| parent | 4b78cd78a3b306d128a731ddc9cefa49b9463c9c (diff) | |
ENGR00279401 mxc v4l2 capture: use flush_work instead of flush_work_sync
Since commit 43829731d (workqueue: deprecate flush[_delayed]_work_sync()),
flush_work() should be used instead of flush_work_sync().
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
(cherry picked from commit e6a35a1d00670415901747a5c1cb06f024d695f9)
| -rw-r--r-- | drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c b/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c index fc77525d1b04..ad5e1c860e01 100644 --- a/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c +++ b/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c @@ -418,7 +418,7 @@ static int bg_overlay_stop(void *private) } #endif - flush_work_sync(&cam->csi_work_struct); + flush_work(&cam->csi_work_struct); cancel_work_sync(&cam->csi_work_struct); if (cam->vf_bufs_vaddr[0]) { diff --git a/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c b/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c index 43baba2e0bfa..416b40b8046c 100644 --- a/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c +++ b/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c @@ -515,7 +515,7 @@ static int foreground_stop(void *private) } #endif - flush_work_sync(&cam->csi_work_struct); + flush_work(&cam->csi_work_struct); cancel_work_sync(&cam->csi_work_struct); if (cam->vf_bufs_vaddr[0]) { |