public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] zoran: Fix &&/|| typo
@ 2009-05-02 20:52 Roel Kluin
  2009-05-02 21:18 ` Alexey Klimov
  0 siblings, 1 reply; 3+ messages in thread
From: Roel Kluin @ 2009-05-02 20:52 UTC (permalink / raw)
  To: hverkuil; +Cc: linux-media, mjpeg-users, Andrew Morton

Fix &&/|| typo

diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index ea6c577..ea9de8b 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)
 	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;

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] zoran: Fix &&/|| typo
  2009-05-02 20:52 Roel Kluin
@ 2009-05-02 21:18 ` Alexey Klimov
  0 siblings, 0 replies; 3+ messages in thread
From: Alexey Klimov @ 2009-05-02 21:18 UTC (permalink / raw)
  To: Roel Kluin; +Cc: hverkuil, linux-media, mjpeg-users, Andrew Morton

Hello, Roel

On Sun, May 3, 2009 at 12:52 AM, Roel Kluin <roel.kluin@gmail.com> wrote:
> Fix &&/|| typo
>
> diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
> index ea6c577..ea9de8b 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)
>        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;

Please, remember that all patches that you send need 'Signed-off-by' field.
And i'm out of touch with events, but probably it's better to make
description more dilated/patulous (i'm not sure here).

-- 
Best regards, Klimov Alexey

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] zoran: Fix &&/|| typo
@ 2009-05-02 21:32 Roel Kluin
  0 siblings, 0 replies; 3+ messages in thread
From: Roel Kluin @ 2009-05-02 21:32 UTC (permalink / raw)
  To: hverkuil; +Cc: linux-media, mjpeg-users, Andrew Morton, klimov.linux

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>
---
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index ea6c577..ea9de8b 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)
 	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;


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-05-02 21:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-02 21:32 [PATCH] zoran: Fix &&/|| typo Roel Kluin
  -- strict thread matches above, loose matches on Subject: below --
2009-05-02 20:52 Roel Kluin
2009-05-02 21:18 ` Alexey Klimov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox