From: Roel Kluin <roel.kluin@gmail.com>
Date: Mon, 16 Feb 2009 12:11:55 +0000 (+0100)
Subject: paride/pg.c: xs(): &&/|| confusion
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=c8cbec6bdf6329279fd14696020f6b59d1d3124d;p=linux-2.6-omap-h63xx.git

paride/pg.c: xs(): &&/|| confusion

&&/|| confusion

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 9dfa2716300..c397b3ddba9 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -422,7 +422,7 @@ static void xs(char *buf, char *targ, int len)
 
 	for (k = 0; k < len; k++) {
 		char c = *buf++;
-		if (c != ' ' || c != l)
+		if (c != ' ' && c != l)
 			l = *targ++ = c;
 	}
 	if (l == ' ')