diff options
| author | Dave Jones <davej@redhat.com> | 2006-07-10 13:45:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 22:24:25 +0200 |
| commit | f1c0a578ca960d10fce049765bb9e5a53fb53d2e (patch) | |
| tree | 2d1d42d490a71919e634418a5cf94ce23137b127 /drivers | |
| parent | [PATCH] s390: move var declarations behind ifdef (diff) | |
| download | linux-f1c0a578ca960d10fce049765bb9e5a53fb53d2e.tar.xz linux-f1c0a578ca960d10fce049765bb9e5a53fb53d2e.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/net/netiucv.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |