From: Dave Jones <davej@redhat.com>
Date: Mon, 10 Jul 2006 11:45:18 +0000 (-0700)
Subject: [PATCH] fix oddball boolean logic in s390 netiucv
X-Git-Tag: v2.6.18-rc2~147
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f1c0a578ca960d10fce049765bb9e5a53fb53d2e;p=karo-tx-linux.git

[PATCH] fix oddball boolean logic in s390 netiucv

Signed-off-by: Dave Jones <davej@redhat.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Andreas Herrmann <aherrman@de.ibm.com>
Cc: Michael Holzheu <holzheu@de.ibm.com>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index b452cc1afd55..5d6e6cbfa360 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -2029,7 +2029,7 @@ remove_write (struct device_driver *drv, const char *buf, size_t count)
                 count = IFNAMSIZ-1;
 
         for (i=0, p=(char *)buf; i<count && *p; i++, p++) {
-                if ((*p == '\n') | (*p == ' ')) {
+                if ((*p == '\n') || (*p == ' ')) {
                         /* trailing lf, grr */
                         break;
                 } else {