summaryrefslogtreecommitdiff
path: root/v4l_experimental
diff options
context:
space:
mode:
authorMike Isely <devnull@localhost>2006-01-01 22:37:19 +0000
committerMike Isely <devnull@localhost>2006-01-01 22:37:19 +0000
commit2836ed0680c21cf74204d651b4257b130debfd26 (patch)
treecf790a23f5e2f9059071bd1e749e4a081a1fc0d0 /v4l_experimental
parentcd30872d561c4bba79f0b1592fe5660e91310163 (diff)
downloadmediapointer-dvb-s2-2836ed0680c21cf74204d651b4257b130debfd26.tar.gz
mediapointer-dvb-s2-2836ed0680c21cf74204d651b4257b130debfd26.tar.bz2
Kill pvrusb2 initialization bug involving saa711x and msp3400
From: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'v4l_experimental')
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-audio.c6
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-video-v4l.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/v4l_experimental/pvrusb2/pvrusb2-audio.c b/v4l_experimental/pvrusb2/pvrusb2-audio.c
index af0547f1b..3ef8fa74c 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-audio.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-audio.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-audio.c,v 1.4 2006/01/01 18:46:45 mcisely Exp $
+ * $Id: pvrusb2-audio.c,v 1.5 2006/01/01 22:37:19 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -229,8 +229,8 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
ctxt->astat.ctxt = ctxt;
ctxt->astat.status = (int (*)(void *))get_audio_status;
ctxt->astat.detach = (void (*)(void *))pvr2_msp3400_detach;
- ctxt->stale_mask = 1 << ((sizeof(msp3400_ops)/
- sizeof(msp3400_ops[0])) - 1);
+ ctxt->stale_mask = (1 << (sizeof(msp3400_ops)/
+ sizeof(msp3400_ops[0]))) - 1;
cp->handler = &ctxt->i2c_handler;
hdw->audio_stat = &ctxt->astat;
return !0;
diff --git a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
index bf91e3d2a..ff042f3e8 100644
--- a/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
+++ b/v4l_experimental/pvrusb2/pvrusb2-video-v4l.c
@@ -1,6 +1,6 @@
/*
*
- * $Id: pvrusb2-video-v4l.c,v 1.6 2006/01/01 08:26:03 mcisely Exp $
+ * $Id: pvrusb2-video-v4l.c,v 1.7 2006/01/01 22:37:19 mcisely Exp $
*
* Copyright (C) 2005 Mike Isely <isely@pobox.com>
* Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
@@ -219,8 +219,8 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw,
ctxt->ctrl.tuned = (int (*)(void *))decoder_is_tuned;
ctxt->client = cp;
ctxt->hdw = hdw;
- ctxt->stale_mask = 1 << ((sizeof(decoder_ops)/
- sizeof(decoder_ops[0])) - 1);
+ ctxt->stale_mask = (1 << (sizeof(decoder_ops)/
+ sizeof(decoder_ops[0]))) - 1;
hdw->decoder_ctrl = &ctxt->ctrl;
cp->handler = &ctxt->handler;
return !0;