aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 16:03:59 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:52 -0400
commit21d4df375be2c9e5f1002800036fbfb793cf031f (patch)
tree0b9f55c40e569bbb24d7996a2bdee144424f8888
parent6a989d7328aa4a0b4793ea05b13871bf1b500b1e (diff)
[PATCH] v4l: print warning if pal= or secam= argument is unrecognized
- print warning if pal= or secam= argument is unrecognized Signed-off-by: Philip Rowlands <phr@doc.ic.ac.uk> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/video/tda9887.c13
-rw-r--r--drivers/media/video/tuner-core.c12
2 files changed, 25 insertions, 0 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 79e0bd1aa70f..0456dda2624d 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -23,6 +23,7 @@
23 TDA9887 (world), TDA9885 (USA) 23 TDA9887 (world), TDA9885 (USA)
24 Note: OP2 of tda988x must be set to 1, else MT2032 is disabled! 24 Note: OP2 of tda988x must be set to 1, else MT2032 is disabled!
25 - KNC One TV-Station RDS (saa7134) 25 - KNC One TV-Station RDS (saa7134)
26 - Hauppauge PVR-150/500 (possibly more)
26*/ 27*/
27 28
28 29
@@ -519,6 +520,12 @@ static int tda9887_fixup_std(struct tda9887 *t)
519 dprintk(PREFIX "insmod fixup: PAL => PAL-DK\n"); 520 dprintk(PREFIX "insmod fixup: PAL => PAL-DK\n");
520 t->std = V4L2_STD_PAL_DK; 521 t->std = V4L2_STD_PAL_DK;
521 break; 522 break;
523 case '-':
524 /* default parameter, do nothing */
525 break;
526 default:
527 printk(PREFIX "pal= argument not recognised\n");
528 break;
522 } 529 }
523 } 530 }
524 if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) { 531 if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
@@ -535,6 +542,12 @@ static int tda9887_fixup_std(struct tda9887 *t)
535 dprintk(PREFIX "insmod fixup: SECAM => SECAM-L\n"); 542 dprintk(PREFIX "insmod fixup: SECAM => SECAM-L\n");
536 t->std = V4L2_STD_SECAM_L; 543 t->std = V4L2_STD_SECAM_L;
537 break; 544 break;
545 case '-':
546 /* default parameter, do nothing */
547 break;
548 default:
549 printk(PREFIX "secam= argument not recognised\n");
550 break;
538 } 551 }
539 } 552 }
540 return 0; 553 return 0;
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index afc96bbb1c11..05572020af4d 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -281,6 +281,12 @@ static int tuner_fixup_std(struct tuner *t)
281 tuner_dbg ("insmod fixup: PAL => PAL-N\n"); 281 tuner_dbg ("insmod fixup: PAL => PAL-N\n");
282 t->std = V4L2_STD_PAL_N; 282 t->std = V4L2_STD_PAL_N;
283 break; 283 break;
284 case '-':
285 /* default parameter, do nothing */
286 break;
287 default:
288 tuner_warn ("pal= argument not recognised\n");
289 break;
284 } 290 }
285 } 291 }
286 if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) { 292 if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
@@ -297,6 +303,12 @@ static int tuner_fixup_std(struct tuner *t)
297 tuner_dbg ("insmod fixup: SECAM => SECAM-L\n"); 303 tuner_dbg ("insmod fixup: SECAM => SECAM-L\n");
298 t->std = V4L2_STD_SECAM_L; 304 t->std = V4L2_STD_SECAM_L;
299 break; 305 break;
306 case '-':
307 /* default parameter, do nothing */
308 break;
309 default:
310 tuner_warn ("secam= argument not recognised\n");
311 break;
300 } 312 }
301 } 313 }
302 314