diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-10 19:28:17 -0700 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-10 19:28:17 -0700 |
| commit | 402f9ceab8607e246c388e640cc657e9b5be0286 (patch) | |
| tree | 5a6c5fa2a4d10a1aff69f2c6f1c21df731b10a43 /linux/drivers/media/video/zoran | |
| parent | 446d4199a156728c0a046418719b2f3a0645ad84 (diff) | |
| download | mediapointer-dvb-s2-402f9ceab8607e246c388e640cc657e9b5be0286.tar.gz mediapointer-dvb-s2-402f9ceab8607e246c388e640cc657e9b5be0286.tar.bz2 | |
zoran: Drop the lock_norm module parameter
From: Jean Delvare <khali@linux-fr.org>
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 <khali@linux-fr.org>
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/zoran')
| -rw-r--r-- | linux/drivers/media/video/zoran/zoran_driver.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c index 32873ca52..97e1c776b 100644 --- a/linux/drivers/media/video/zoran/zoran_driver.c +++ b/linux/drivers/media/video/zoran/zoran_driver.c @@ -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 */ @@ -1491,22 +1487,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", |