diff options
| -rw-r--r-- | v4l/ChangeLog | 11 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-audio.c | 6 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-video-v4l.c | 6 |
3 files changed, 17 insertions, 6 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index f938d9c3d..bf2528310 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2006-01-01 22:35 mcisely + + * v4l_experimental/pvrusb2/pvrusb2-audio.c: + (pvr2_i2c_msp3400_setup): + * v4l_experimental/pvrusb2/pvrusb2-video-v4l.c: + (pvr2_i2c_decoder_v4l_setup): + + -Kill pvrusb2 initialization bug involving saa711x and msp3400 + + Signed-off-by: Mike Isely <isely@pobox.com> + 2006-01-01 19:25 mkrufky * linux/drivers/media/dvb/dvb-usb/cxusb.c: 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; |