diff options
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 5fbb4e49495..f2b37e05b96 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -170,7 +170,7 @@ static void request_submodules(struct saa7134_dev *dev) | |||
170 | 170 | ||
171 | static void flush_request_submodules(struct saa7134_dev *dev) | 171 | static void flush_request_submodules(struct saa7134_dev *dev) |
172 | { | 172 | { |
173 | flush_work_sync(&dev->request_module_wk); | 173 | flush_work(&dev->request_module_wk); |
174 | } | 174 | } |
175 | 175 | ||
176 | #else | 176 | #else |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index dde361a9194..4df79c65690 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -556,7 +556,7 @@ static int empress_fini(struct saa7134_dev *dev) | |||
556 | 556 | ||
557 | if (NULL == dev->empress_dev) | 557 | if (NULL == dev->empress_dev) |
558 | return 0; | 558 | return 0; |
559 | flush_work_sync(&dev->empress_workqueue); | 559 | flush_work(&dev->empress_workqueue); |
560 | video_unregister_device(dev->empress_dev); | 560 | video_unregister_device(dev->empress_dev); |
561 | dev->empress_dev = NULL; | 561 | dev->empress_dev = NULL; |
562 | return 0; | 562 | return 0; |