diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-05-02 16:52:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:59 -0400 |
commit | b475f4eeda1da16e995b2302f6eebdfb08ce18cd (patch) | |
tree | c2712c69d925cba5c3a22d3f7de2e70764580de0 /drivers/media/video | |
parent | 223ffe5f8270ba9d069f1cbff9acec095a6f58b1 (diff) |
V4L/DVB (11741): zoran: Fix &&/|| typo
Fix &&/|| typo. `default_norm' can be 0 (PAL), 1 (NTSC) or 2 (SECAM),
the condition tested was impossible.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/zoran/zoran_card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c index ea6c577b0eb3..ea9de8b47db3 100644 --- a/drivers/media/video/zoran/zoran_card.c +++ b/drivers/media/video/zoran/zoran_card.c | |||
@@ -1022,7 +1022,7 @@ zr36057_init (struct zoran *zr) | |||
1022 | zr->vbuf_bytesperline = 0; | 1022 | zr->vbuf_bytesperline = 0; |
1023 | 1023 | ||
1024 | /* Avoid nonsense settings from user for default input/norm */ | 1024 | /* Avoid nonsense settings from user for default input/norm */ |
1025 | if (default_norm < 0 && default_norm > 2) | 1025 | if (default_norm < 0 || default_norm > 2) |
1026 | default_norm = 0; | 1026 | default_norm = 0; |
1027 | if (default_norm == 0) { | 1027 | if (default_norm == 0) { |
1028 | zr->norm = V4L2_STD_PAL; | 1028 | zr->norm = V4L2_STD_PAL; |