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)