aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/paride/pg.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-02-16 13:11:55 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-02-18 10:32:01 +0100
commitc8cbec6bdf6329279fd14696020f6b59d1d3124d (patch)
treebdaccc9c80eefefe7e6a543f3a9b5b2a6dc7c8a8 /drivers/block/paride/pg.c
parentfs/bio: bio_alloc_bioset: pass right object ptr to mempool_free (diff)
downloadlinux-dev-c8cbec6bdf6329279fd14696020f6b59d1d3124d.tar.xz
linux-dev-c8cbec6bdf6329279fd14696020f6b59d1d3124d.zip
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>
Diffstat (limited to 'drivers/block/paride/pg.c')
-rw-r--r--drivers/block/paride/pg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 9dfa27163001..c397b3ddba9b 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 == ' ')