From 7b4a44fffd367f9d0be136058ea92d533e936770 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 24 Oct 2012 08:14:16 -0300 Subject: [PATCH] --- yaml --- r: 357021 b: refs/heads/master c: 4bb891ebf60eb43ebd04e09bbcad24013067873f h: refs/heads/master i: 357019: 68b088fe76be7fc57be2a3493a73f5e055e9ca2f v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ivtv/ivtv-driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15b390c8a93b..4e97648cb8c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b391b0ef0f9399dcba8fa025ab5e5d4229847467 +refs/heads/master: 4bb891ebf60eb43ebd04e09bbcad24013067873f diff --git a/trunk/drivers/media/pci/ivtv/ivtv-driver.c b/trunk/drivers/media/pci/ivtv/ivtv-driver.c index 74e9a5032364..5d0a5df61078 100644 --- a/trunk/drivers/media/pci/ivtv/ivtv-driver.c +++ b/trunk/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)