summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Smith <gsmith@nc.rr.com>2006-05-15 18:44:02 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-15 20:20:55 +0200
commit698d070746770aaaec78ab4ffa3ab1f1d5c6abe8 (patch)
tree00aab6741bbc7e8c419903a7d8f4f876889c7a8a
parent[PATCH] setup_per_zone_pages_min() overflow fix (diff)
downloadlinux-698d070746770aaaec78ab4ffa3ab1f1d5c6abe8.tar.xz
linux-698d070746770aaaec78ab4ffa3ab1f1d5c6abe8.zip
[PATCH] s390: lcs incorrect test
While debugging why our LCS emulator is having some problems I noticed the following weirdness in drivers/s390/net/lcs.c routine lcs_irq. The `if' statement is always true since SCHN_STAT_PCI is defined as 0x80. Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/s390/net/lcs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 5d6b7a57b02f..e65da921a827 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1348,7 +1348,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
index = (struct ccw1 *) __va((addr_t) irb->scsw.cpa)
- channel->ccws;
if ((irb->scsw.actl & SCSW_ACTL_SUSPENDED) ||
- (irb->scsw.cstat | SCHN_STAT_PCI))
+ (irb->scsw.cstat & SCHN_STAT_PCI))
/* Bloody io subsystem tells us lies about cpa... */
index = (index - 1) & (LCS_NUM_BUFFS - 1);
while (channel->io_idx != index) {