diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-06-01 03:33:05 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-06-01 03:33:05 +0000 |
| commit | 3e37580caf15e21a62451a67a4337d38c6ff2b6a (patch) | |
| tree | e0c7ddbaa1489cfc6f061b45546ee8bc8bb885b9 /linux/drivers/media/video/cx88/cx88-core.c | |
| parent | 60bfed10defd8ee920ab058cc8baa55331a77fc0 (diff) | |
| download | mediapointer-dvb-s2-3e37580caf15e21a62451a67a4337d38c6ff2b6a.tar.gz mediapointer-dvb-s2-3e37580caf15e21a62451a67a4337d38c6ff2b6a.tar.bz2 | |
Cosmetic changes.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 12 |
1 files changed, 7 insertions, 5 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; } |