]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ENGR00279401 mxc v4l2 capture: use flush_work instead of flush_work_sync
authorLiu Ying <Ying.Liu@freescale.com>
Thu, 12 Sep 2013 07:50:13 +0000 (15:50 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 20 Aug 2014 08:06:31 +0000 (10:06 +0200)
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>
drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c
drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c

index fc77525d1b04ebe8750d9d2e3a87101179ed941f..ad5e1c860e01f03e3a693cc588c9b581b4efea43 100644 (file)
@@ -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]) {
index 43baba2e0bfab3028c31c3750dcb27e511f3991f..416b40b8046c1d84e06b601b77c2328a325a7e1a 100644 (file)
@@ -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]) {