netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] isdn: capi: &&/|| typos
@ 2008-12-30 12:31 Roel Kluin
  2009-01-02 12:16 ` Karsten Keil
  0 siblings, 1 reply; 3+ messages in thread
From: Roel Kluin @ 2008-12-30 12:31 UTC (permalink / raw)
  To: kkeil; +Cc: netdev

Correct two typos.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index d5b4cc3..6501202 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -1519,7 +1519,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep)
 		int digit2 = 0;
 		if (!isdigit(*s)) return -3;
 		while (isdigit(*s)) { digit1 = digit1*10 + (*s - '0'); s++; }
-		if (digit1 <= 0 && digit1 > 30) return -4;
+		if (digit1 <= 0 || digit1 > 30) return -4;
 		if (*s == 0 || *s == ',' || *s == ' ') {
 			bmask |= (1 << digit1);
 			digit1 = 0;
@@ -1530,7 +1530,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep)
 		s++;
 		if (!isdigit(*s)) return -3;
 		while (isdigit(*s)) { digit2 = digit2*10 + (*s - '0'); s++; }
-		if (digit2 <= 0 && digit2 > 30) return -4;
+		if (digit2 <= 0 || digit2 > 30) return -4;
 		if (*s == 0 || *s == ',' || *s == ' ') {
 			if (digit1 > digit2)
 				for (i = digit2; i <= digit1 ; i++)

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

* Re: [PATCH] isdn: capi: &&/|| typos
  2008-12-30 12:31 [PATCH] isdn: capi: &&/|| typos Roel Kluin
@ 2009-01-02 12:16 ` Karsten Keil
  2009-01-05  0:22   ` David Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Karsten Keil @ 2009-01-02 12:16 UTC (permalink / raw)
  To: Roel Kluin; +Cc: kkeil, netdev

On Tue, Dec 30, 2008 at 01:31:38PM +0100, Roel Kluin wrote:
> Correct two typos.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>

Acked-by: Karsten Keil <kkeil@suse.de>

> ---
> diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
> index d5b4cc3..6501202 100644
> --- a/drivers/isdn/capi/capidrv.c
> +++ b/drivers/isdn/capi/capidrv.c
> @@ -1519,7 +1519,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep)
>  		int digit2 = 0;
>  		if (!isdigit(*s)) return -3;
>  		while (isdigit(*s)) { digit1 = digit1*10 + (*s - '0'); s++; }
> -		if (digit1 <= 0 && digit1 > 30) return -4;
> +		if (digit1 <= 0 || digit1 > 30) return -4;
>  		if (*s == 0 || *s == ',' || *s == ' ') {
>  			bmask |= (1 << digit1);
>  			digit1 = 0;
> @@ -1530,7 +1530,7 @@ static int decodeFVteln(char *teln, unsigned long *bmaskp, int *activep)
>  		s++;
>  		if (!isdigit(*s)) return -3;
>  		while (isdigit(*s)) { digit2 = digit2*10 + (*s - '0'); s++; }
> -		if (digit2 <= 0 && digit2 > 30) return -4;
> +		if (digit2 <= 0 || digit2 > 30) return -4;
>  		if (*s == 0 || *s == ',' || *s == ' ') {
>  			if (digit1 > digit2)
>  				for (i = digit2; i <= digit1 ; i++)

-- 
Karsten Keil
SuSE Labs
ISDN and VOIP development
SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)

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

* Re: [PATCH] isdn: capi: &&/|| typos
  2009-01-02 12:16 ` Karsten Keil
@ 2009-01-05  0:22   ` David Miller
  0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-01-05  0:22 UTC (permalink / raw)
  To: kkeil; +Cc: roel.kluin, netdev

From: Karsten Keil <kkeil@suse.de>
Date: Fri, 2 Jan 2009 13:16:30 +0100

> On Tue, Dec 30, 2008 at 01:31:38PM +0100, Roel Kluin wrote:
> > Correct two typos.
> > 
> > Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> 
> Acked-by: Karsten Keil <kkeil@suse.de>

Applied, thanks everyone.

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

end of thread, other threads:[~2009-01-05  0:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-30 12:31 [PATCH] isdn: capi: &&/|| typos Roel Kluin
2009-01-02 12:16 ` Karsten Keil
2009-01-05  0:22   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).