Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8182
b: refs/heads/master
c: 21d4df3
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab authored and Linus Torvalds committed Sep 9, 2005
1 parent 8804d4d commit e9b9384
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6a989d7328aa4a0b4793ea05b13871bf1b500b1e
refs/heads/master: 21d4df375be2c9e5f1002800036fbfb793cf031f
13 changes: 13 additions & 0 deletions trunk/drivers/media/video/tda9887.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
TDA9887 (world), TDA9885 (USA)
Note: OP2 of tda988x must be set to 1, else MT2032 is disabled!
- KNC One TV-Station RDS (saa7134)
- Hauppauge PVR-150/500 (possibly more)
*/


Expand Down Expand Up @@ -519,6 +520,12 @@ static int tda9887_fixup_std(struct tda9887 *t)
dprintk(PREFIX "insmod fixup: PAL => PAL-DK\n");
t->std = V4L2_STD_PAL_DK;
break;
case '-':
/* default parameter, do nothing */
break;
default:
printk(PREFIX "pal= argument not recognised\n");
break;
}
}
if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
Expand All @@ -535,6 +542,12 @@ static int tda9887_fixup_std(struct tda9887 *t)
dprintk(PREFIX "insmod fixup: SECAM => SECAM-L\n");
t->std = V4L2_STD_SECAM_L;
break;
case '-':
/* default parameter, do nothing */
break;
default:
printk(PREFIX "secam= argument not recognised\n");
break;
}
}
return 0;
Expand Down
12 changes: 12 additions & 0 deletions trunk/drivers/media/video/tuner-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,12 @@ static int tuner_fixup_std(struct tuner *t)
tuner_dbg ("insmod fixup: PAL => PAL-N\n");
t->std = V4L2_STD_PAL_N;
break;
case '-':
/* default parameter, do nothing */
break;
default:
tuner_warn ("pal= argument not recognised\n");
break;
}
}
if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
Expand All @@ -297,6 +303,12 @@ static int tuner_fixup_std(struct tuner *t)
tuner_dbg ("insmod fixup: SECAM => SECAM-L\n");
t->std = V4L2_STD_SECAM_L;
break;
case '-':
/* default parameter, do nothing */
break;
default:
tuner_warn ("secam= argument not recognised\n");
break;
}
}

Expand Down

0 comments on commit e9b9384

Please sign in to comment.