summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-28 07:59:35 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-28 07:59:35 -0300
commitc0ed3442e926ec304d6d231bfaa66d5e2e53059c (patch)
treeb15123da87e6668c64f17e4d4eebfaa01449523e /linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
parent7d302bb17d4ebe98e2e0cbe76beb2a72b3292843 (diff)
parente62da4f3647592717616864fd8e60b7f27566953 (diff)
downloadmediapointer-dvb-s2-c0ed3442e926ec304d6d231bfaa66d5e2e53059c.tar.gz
mediapointer-dvb-s2-c0ed3442e926ec304d6d231bfaa66d5e2e53059c.tar.bz2
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index c80c26be6..df8feac16 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -221,7 +221,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt,
static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)
{
int ret;
- ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,NULL);
+ ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_RESET,0);
pvr2_trace(PVR2_TRACE_CHIPS,"i2c cx25840 decoder_reset (ret=%d)",ret);
}