Merge branch 'staging/for_v3.7' into v4l_for_linus

[mirror_ubuntu-zesty-kernel.git] / drivers / media / pci / bt8xx / bttv-driver.c

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 8bad444c86f24ec89692d25fc58bc6b15b2c4a69..56c6c77793d726f48c50eefbe6cb399a46b19ffe 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -196,7 +196,7 @@ static void request_modules(struct bttv *dev)
 
 static void flush_request_modules(struct bttv *dev)
 {
-       flush_work_sync(&dev->request_module_wk);
+       flush_work(&dev->request_module_wk);
 }
 #else
 #define request_modules(dev)