The patch number 10931 was added via Trent Piepho <xy...@speakeasy.org>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Jean Delvare <kh...@linux-fr.org>
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.
Priority: normal
Signed-off-by: Jean Delvare <kh...@linux-fr.org>
Signed-off-by: Trent Piepho <xy...@speakeasy.org>
Cc: Hans Verkuil <hverk...@xs4all.nl>
---
linux/Documentation/video4linux/Zoran | 3 --
linux/drivers/media/video/zoran/zoran_driver.c | 20 -----------------
2 files changed, 1 insertion(+), 22 deletions(-)
diff -r 41592ce6cba3 -r da9f9c766f07 linux/Documentation/video4linux/Zoran
--- a/linux/Documentation/video4linux/Zoran Tue Mar 10 19:28:16 2009 -0700
+++ b/linux/Documentation/video4linux/Zoran Tue Mar 10 19:28:17 2009 -0700
@@ -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/).
diff -r 41592ce6cba3 -r da9f9c766f07
linux/drivers/media/video/zoran/zoran_driver.c
--- a/linux/drivers/media/video/zoran/zoran_driver.c Tue Mar 10 19:28:16
2009 -0700
+++ b/linux/drivers/media/video/zoran/zoran_driver.c Tue Mar 10 19:28:17
2009 -0700
@@ -163,10 +163,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 */
@@ -1489,22 +1485,6 @@ zoran_set_norm (struct zoran *zr,
"%s: set_norm() called while in playback/capture
mode\n",
ZR_DEVNAME(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)) {
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/da9f9c766f07444725dddc3ec197174263d7af82
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
