aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-21 10:39:21 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:23:34 -0400
commitc57032decdd07e531fc557a207c9ecd5eef9274d (patch)
tree4e88c44403404d08a7f13bfbe5bd3aae3c0e73bc /drivers/media
parent783aa8fa1fe666a039edb784d9458647da97d28a (diff)
V4L/DVB (5681): Correct aliases for STD/L and STD/Lc
Some macros were using very weird names, like PAL/L (this std doesn't exist). Fixing it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/tuner-simple.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index c40b92ce1fad..b5792d6a73f3 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -54,9 +54,9 @@ MODULE_PARM_DESC(offset,"Allows to specify an offset for tuner");
54 sound 2 33.16 - - 54 sound 2 33.16 - -
55 NICAM 33.05 33.05 39.80 55 NICAM 33.05 33.05 39.80
56 */ 56 */
57#define PHILIPS_MF_SET_BG 0x01 /* Bit 2 must be zero, Bit 3 is system output */ 57#define PHILIPS_MF_SET_STD_BG 0x01 /* Bit 2 must be zero, Bit 3 is system output */
58#define PHILIPS_MF_SET_PAL_L 0x03 // France 58#define PHILIPS_MF_SET_STD_L 0x03 /* Used on Secam France */
59#define PHILIPS_MF_SET_PAL_L2 0x02 // L' 59#define PHILIPS_MF_SET_STD_LC 0x02 /* Used on SECAM L' */
60 60
61/* Control byte */ 61/* Control byte */
62 62
@@ -207,11 +207,11 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
207 /* 0x04 -> ??? PAL others / SECAM others ??? */ 207 /* 0x04 -> ??? PAL others / SECAM others ??? */
208 cb &= ~0x03; 208 cb &= ~0x03;
209 if (t->std & V4L2_STD_SECAM_L) //also valid for V4L2_STD_SECAM 209 if (t->std & V4L2_STD_SECAM_L) //also valid for V4L2_STD_SECAM
210 cb |= PHILIPS_MF_SET_PAL_L; 210 cb |= PHILIPS_MF_SET_STD_L;
211 else if (t->std & V4L2_STD_SECAM_LC) 211 else if (t->std & V4L2_STD_SECAM_LC)
212 cb |= PHILIPS_MF_SET_PAL_L2; 212 cb |= PHILIPS_MF_SET_STD_LC;
213 else /* V4L2_STD_B|V4L2_STD_GH */ 213 else /* V4L2_STD_B|V4L2_STD_GH */
214 cb |= PHILIPS_MF_SET_BG; 214 cb |= PHILIPS_MF_SET_STD_BG;
215 break; 215 break;
216 216
217 case TUNER_TEMIC_4046FM5: 217 case TUNER_TEMIC_4046FM5: