From d6aa86421c07298ee755edd358d20cf909031d74 Mon Sep 17 00:00:00 2001
From: Greg Smith <gsmith@nc.rr.com>
Date: Mon, 15 May 2006 09:44:02 -0700
Subject: [PATCH] --- yaml --- r: 26704 b: refs/heads/master c:
 698d070746770aaaec78ab4ffa3ab1f1d5c6abe8 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/s390/net/lcs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7b3df5e6c70a..dc11d82f6d66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac924c6034d9095f95ee889f7e31bbb9145da0c2
+refs/heads/master: 698d070746770aaaec78ab4ffa3ab1f1d5c6abe8
diff --git a/trunk/drivers/s390/net/lcs.c b/trunk/drivers/s390/net/lcs.c
index 5d6b7a57b02f..e65da921a827 100644
--- a/trunk/drivers/s390/net/lcs.c
+++ b/trunk/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) {