]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5398): Cpia_pp.c: don't use _WORK_NAR
authorOleg Nesterov <oleg@tv-sign.ru>
Fri, 9 Mar 2007 20:43:39 +0000 (17:43 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 27 Apr 2007 18:44:21 +0000 (15:44 -0300)
pp_cam_entry->cb_task need not to be _NOAUTOREL ... because in fact it is
never used ???

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/cpia_pp.c

index b12cec94f4cc917af762dd93d459587b80804240..86bd08270ded1e319dffe9d3f5bf06e29d7abb57 100644 (file)
@@ -141,7 +141,6 @@ static void cpia_pp_run_callback(struct work_struct *work)
        cam = container_of(work, struct pp_cam_entry, cb_task);
        cb_func = cam->cb_func;
        cb_data = cam->cb_data;
-       work_release(work);
 
        cb_func(cb_data);
 }
@@ -682,7 +681,7 @@ static int cpia_pp_registerCallback(void *privdata, void (*cb)(void *cbdata), vo
        if(cam->port->irq != PARPORT_IRQ_NONE) {
                cam->cb_func = cb;
                cam->cb_data = cbdata;
-               INIT_WORK_NAR(&cam->cb_task, cpia_pp_run_callback);
+               INIT_WORK(&cam->cb_task, cpia_pp_run_callback);
        } else {
                retval = -1;
        }