diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 12 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 7f81b8c69..09efd73ac 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.25 2005/05/15 18:49:52 mchehab Exp $ + * $Id: cx88-core.c,v 1.26 2005/06/01 03:33:05 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -742,9 +742,9 @@ static unsigned int inline norm_fsc8(struct cx88_tvnorm *norm) { static const unsigned int ntsc = 28636360; static const unsigned int pal = 35468950; - static const unsigned int palm = 28604892; + static const unsigned int palm = 28604892; - if (V4L2_STD_PAL_M & norm->id) + if (norm->id & V4L2_STD_PAL_M) return palm; return (norm->id & V4L2_STD_625_50) ? pal : ntsc; @@ -759,9 +759,11 @@ static unsigned int inline norm_notchfilter(struct cx88_tvnorm *norm) static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) { - /* Should be Line Draw Time / (4*FSC) */ - if (V4L2_STD_PAL_M & norm->id) + /* Should always be Line Draw Time / (4*FSC) */ + + if (norm->id & V4L2_STD_PAL_M) return 909; + return (norm->id & V4L2_STD_625_50) ? 1135 : 910; } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 111fa6f90..b12e9dcd0 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,8 @@ +2005-06-01 04:31 mchehab + * cx88-cards.c: + + - cosmetic changes to reflect pal_m patch applied to -mm series. + 2005-06-01 03:32 mchehab * scripts/make_kern_diff.sh: @@ -1092,7 +1097,7 @@ saa7134-reg.h, saa7134-ts.c, saa7134-tvaudio.c, saa7134-vbi.c, saa7134-video.c, saa7134.h, video-buf.c, video-buf.h: - - added a bunch of $Id: ChangeLog,v 1.13 2005/06/01 03:27:37 mchehab Exp $ tags. + - added a bunch of $Id: ChangeLog,v 1.14 2005/06/01 03:33:05 mchehab Exp $ tags. 2004-09-15 17:35 kraxel |