1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 2befa3819cdb..7874d9790a51 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -449,6 +449,14 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
 
         spin_lock_init(&cx->lock);
 
+        cx->work_queue = create_singlethread_workqueue(cx->name);
+        if (cx->work_queue == NULL) {
+                CX18_ERR("Could not create work queue\n");
+                return -1;
+        }
+
+        INIT_WORK(&cx->work, cx18_work_handler);
+
         /* start counting open_id at 1 */
         cx->open_id = 1;
 
@@ -831,6 +839,7 @@ free_map:
 free_mem:
         release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 free_workqueue:
+        destroy_workqueue(cx->work_queue);
 err:
         if (retval == 0)
                 retval = -ENODEV;
@@ -931,6 +940,9 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
         cx18_halt_firmware(cx);
 
+        flush_workqueue(cx->work_queue);
+        destroy_workqueue(cx->work_queue);
+
         cx18_streams_cleanup(cx, 1);
 
         exit_cx18_i2c(cx);