aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cpia_pp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c
index b12cec94f4cc..86bd08270ded 100644
--- a/drivers/media/video/cpia_pp.c
+++ b/drivers/media/video/cpia_pp.c
@@ -141,7 +141,6 @@ static void cpia_pp_run_callback(struct work_struct *work)
141 cam = container_of(work, struct pp_cam_entry, cb_task); 141 cam = container_of(work, struct pp_cam_entry, cb_task);
142 cb_func = cam->cb_func; 142 cb_func = cam->cb_func;
143 cb_data = cam->cb_data; 143 cb_data = cam->cb_data;
144 work_release(work);
145 144
146 cb_func(cb_data); 145 cb_func(cb_data);
147} 146}
@@ -682,7 +681,7 @@ static int cpia_pp_registerCallback(void *privdata, void (*cb)(void *cbdata), vo
682 if(cam->port->irq != PARPORT_IRQ_NONE) { 681 if(cam->port->irq != PARPORT_IRQ_NONE) {
683 cam->cb_func = cb; 682 cam->cb_func = cb;
684 cam->cb_data = cbdata; 683 cam->cb_data = cbdata;
685 INIT_WORK_NAR(&cam->cb_task, cpia_pp_run_callback); 684 INIT_WORK(&cam->cb_task, cpia_pp_run_callback);
686 } else { 685 } else {
687 retval = -1; 686 retval = -1;
688 } 687 }