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

Commit 4dbf46a0 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10931): zoran: Drop the lock_norm module parameter 



The lock_norm module parameter doesn't look terribly useful. If you
don't want to change the norm, just don't change it. As a matter of
fact, no other v4l driver has such a parameter.

Cc: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1159b7f1

Documentation/video4linux/Zoran

+1 −2
Original line number Diff line number Diff line
@@ -401,8 +401,7 @@ Additional notes for software developers: 
   first set the correct norm. Well, it seems logically correct: TV

   standard is "more constant" for current country than geometry

   settings of a variety of TV capture cards which may work in ITU or

   square pixel format. Remember that users now can lock the norm to

   avoid any ambiguity.

   square pixel format.

--

Please note that lavplay/lavrec are also included in the MJPEG-tools

(http://mjpeg.sf.net/).

drivers/media/video/zoran/zoran_driver.c

+0 −20
Original line number Diff line number Diff line
@@ -162,10 +162,6 @@ const struct zoran_format zoran_formats[] = { 
};

#define NUM_FORMATS ARRAY_SIZE(zoran_formats)



static int lock_norm;	/* 0 = default 1 = Don't change TV standard (norm) */

module_param(lock_norm, int, 0644);

MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)");



	/* small helper function for calculating buffersizes for v4l2

	 * we calculate the nearest higher power-of-two, which

	 * will be the recommended buffersize */
@@ -1483,22 +1479,6 @@ zoran_set_norm (struct zoran *zr, 
		return -EBUSY;

	}



	if (lock_norm && norm != zr->norm) {

		if (lock_norm > 1) {

			dprintk(1,

				KERN_WARNING

				"%s: set_norm() - TV standard is locked, can not switch norm\n",

				ZR_DEVNAME(zr));

			return -EPERM;

		} else {

			dprintk(1,

				KERN_WARNING

				"%s: set_norm() - TV standard is locked, norm was not changed\n",

				ZR_DEVNAME(zr));

			norm = zr->norm;

		}

	}



	if (!(norm & zr->card.norms)) {

		dprintk(1,

			KERN_ERR "%s: set_norm() - unsupported norm %llx\n",