summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-03-09 18:43:39 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-03-09 18:43:39 -0200
commitefffe5f20652aa0ba618b4a4180719bf468e4343 (patch)
treef71f222a081ddf2cf28c3a6957ad1a0d7951fa64
parentfa42008dc4a7ac3b669d5490509e6e5868142657 (diff)
downloadmediapointer-dvb-s2-efffe5f20652aa0ba618b4a4180719bf468e4343.tar.gz
mediapointer-dvb-s2-efffe5f20652aa0ba618b4a4180719bf468e4343.tar.bz2
Cpia_pp.c: don't use _WORK_NAR
From: Oleg Nesterov <oleg@tv-sign.ru> 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>
-rw-r--r--linux/drivers/media/video/cpia_pp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cpia_pp.c b/linux/drivers/media/video/cpia_pp.c
index 26e7e6d5b..337675e96 100644
--- a/linux/drivers/media/video/cpia_pp.c
+++ b/linux/drivers/media/video/cpia_pp.c
@@ -144,7 +144,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);
}
@@ -689,7 +688,7 @@ static int cpia_pp_registerCallback(void *privdata, void (*cb)(void *cbdata), vo
#else
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);
#endif
} else {
retval = -1;