aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-03-10 22:28:17 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:16 -0400
commit4dbf46a0485a5b0704e1c4b55a173128fbaedec9 (patch)
treeb169d15df798fb6f8b1f7d4c92d0e760969cd75d /drivers/media/video/zoran
parent1159b7f19f324db0c61d1277987374865690ec06 (diff)
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: Jean Delvare <khali@linux-fr.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r--drivers/media/video/zoran/zoran_driver.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 26be1a8908a3..1869d307a59d 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -162,10 +162,6 @@ const struct zoran_format zoran_formats[] = {
162}; 162};
163#define NUM_FORMATS ARRAY_SIZE(zoran_formats) 163#define NUM_FORMATS ARRAY_SIZE(zoran_formats)
164 164
165static int lock_norm; /* 0 = default 1 = Don't change TV standard (norm) */
166module_param(lock_norm, int, 0644);
167MODULE_PARM_DESC(lock_norm, "Prevent norm changes (1 = ignore, >1 = fail)");
168
169 /* small helper function for calculating buffersizes for v4l2 165 /* small helper function for calculating buffersizes for v4l2
170 * we calculate the nearest higher power-of-two, which 166 * we calculate the nearest higher power-of-two, which
171 * will be the recommended buffersize */ 167 * will be the recommended buffersize */
@@ -1483,22 +1479,6 @@ zoran_set_norm (struct zoran *zr,
1483 return -EBUSY; 1479 return -EBUSY;
1484 } 1480 }
1485 1481
1486 if (lock_norm && norm != zr->norm) {
1487 if (lock_norm > 1) {
1488 dprintk(1,
1489 KERN_WARNING
1490 "%s: set_norm() - TV standard is locked, can not switch norm\n",
1491 ZR_DEVNAME(zr));
1492 return -EPERM;
1493 } else {
1494 dprintk(1,
1495 KERN_WARNING
1496 "%s: set_norm() - TV standard is locked, norm was not changed\n",
1497 ZR_DEVNAME(zr));
1498 norm = zr->norm;
1499 }
1500 }
1501
1502 if (!(norm & zr->card.norms)) { 1482 if (!(norm & zr->card.norms)) {
1503 dprintk(1, 1483 dprintk(1,
1504 KERN_ERR "%s: set_norm() - unsupported norm %llx\n", 1484 KERN_ERR "%s: set_norm() - unsupported norm %llx\n",