V4L/DVB (5398): Cpia_pp.c: don't use _WORK_NAR
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>
This commit is contained in:
parent
15f189e978
commit
5cdc178d1c
|
@ -141,7 +141,6 @@ static void cpia_pp_run_callback(struct work_struct *work)
|
||||||
cam = container_of(work, struct pp_cam_entry, cb_task);
|
cam = container_of(work, struct pp_cam_entry, cb_task);
|
||||||
cb_func = cam->cb_func;
|
cb_func = cam->cb_func;
|
||||||
cb_data = cam->cb_data;
|
cb_data = cam->cb_data;
|
||||||
work_release(work);
|
|
||||||
|
|
||||||
cb_func(cb_data);
|
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) {
|
if(cam->port->irq != PARPORT_IRQ_NONE) {
|
||||||
cam->cb_func = cb;
|
cam->cb_func = cb;
|
||||||
cam->cb_data = cbdata;
|
cam->cb_data = cbdata;
|
||||||
INIT_WORK_NAR(&cam->cb_task, cpia_pp_run_callback);
|
INIT_WORK(&cam->cb_task, cpia_pp_run_callback);
|
||||||
} else {
|
} else {
|
||||||
retval = -1;
|
retval = -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue