From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Wed, 24 Oct 2012 11:14:16 +0000 (-0300)
Subject: [media] ivtv: ivtv-driver: Replace 'flush_work_sync()'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4bb891ebf60eb43ebd04e09bbcad24013067873f;p=linux-beck.git

[media] ivtv: ivtv-driver: Replace '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: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 74e9a5032364..5d0a5df61078 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -304,7 +304,7 @@ static void request_modules(struct ivtv *dev)
 
 static void flush_request_modules(struct ivtv *dev)
 {
-	flush_work_sync(&dev->request_module_wk);
+	flush_work(&dev->request_module_wk);
 }
 #else
 #define request_modules(dev)