diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 10:11:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-27 10:11:39 -0300 |
| commit | e869f37a082df276cbc412d3f7da04fd3b41fed4 (patch) | |
| tree | a4067ce193263515f64018aaec0d618fe5864e86 /linux/drivers/media/video/zoran/zoran_card.c | |
| parent | fc06889a7cb90e50621ecaaf22f2f575b5ae6a44 (diff) | |
| parent | f8a7ff5ce3d73304b156a0ed39d309050c903a82 (diff) | |
| download | mediapointer-dvb-s2-e869f37a082df276cbc412d3f7da04fd3b41fed4.tar.gz mediapointer-dvb-s2-e869f37a082df276cbc412d3f7da04fd3b41fed4.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-av-core
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_card.c')
| -rw-r--r-- | linux/drivers/media/video/zoran/zoran_card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_card.c b/linux/drivers/media/video/zoran/zoran_card.c index 733db7690..67ab10878 100644 --- a/linux/drivers/media/video/zoran/zoran_card.c +++ b/linux/drivers/media/video/zoran/zoran_card.c @@ -1023,7 +1023,7 @@ zr36057_init (struct zoran *zr) zr->vbuf_bytesperline = 0; /* Avoid nonsense settings from user for default input/norm */ - if (default_norm < 0 && default_norm > 2) + if (default_norm < 0 || default_norm > 2) default_norm = 0; if (default_norm == 0) { zr->norm = V4L2_STD_PAL; |