Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21d4df37 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: print warning if pal= or secam= argument is unrecognized 



- print warning if pal= or secam= argument is unrecognized

Signed-off-by: default avatarPhilip Rowlands <phr@doc.ic.ac.uk>
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6a989d73

drivers/media/video/tda9887.c

+13 −0
Original line number Diff line number Diff line
@@ -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)

*/
@@ -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) {
@@ -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;

drivers/media/video/tuner-core.c

+12 −0
Original line number Diff line number Diff line
@@ -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) {
@@ -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;

		}

	}