From 17ed83235e9371e0c934ecaf863463683a3735f0 Mon Sep 17 00:00:00 2001
From: Cornelia Huck <cohuck@de.ibm.com>
Date: Wed, 27 Jul 2005 11:45:01 -0700
Subject: [PATCH] --- yaml --- r: 5183 b: refs/heads/master c:
 c63307f164a79e0ff6dd2da33436c59b3d3396cd h: refs/heads/master i:   5181:
 d9600f5d4bc3f4e439b2fcc70e1b4de70b24e217   5179:
 4b695468e7384895fec8396369fd64a29f4b89e7   5175:
 5a99779cebb61407cad9dc74728fdbf2cec7b720   5167:
 164c9e7f503be0c1b455bd6f63a0056d8cda5982   5151:
 09b09bb4eee80483b35e11d236bf884e569ef5f3   5119:
 836927ce995f8038a9cf96fd4736ba3ec106f27c v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/s390/cio/chsc.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f28838888f19..420c1ebd7f83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d3ac7aadbccd8456fdca09394ddb570b95fe7dc
+refs/heads/master: c63307f164a79e0ff6dd2da33436c59b3d3396cd
diff --git a/trunk/drivers/s390/cio/chsc.c b/trunk/drivers/s390/cio/chsc.c
index b86f94ecd874..fa3c23b80e3a 100644
--- a/trunk/drivers/s390/cio/chsc.c
+++ b/trunk/drivers/s390/cio/chsc.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/chsc.c
  *   S/390 common I/O routines -- channel subsystem call
- *   $Revision: 1.119 $
+ *   $Revision: 1.120 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *			      IBM Corporation
@@ -412,11 +412,7 @@ s390_process_res_acc (u8 chpid, __u16 fla, u32 fla_mask)
 		if (chp_mask == 0) {
 
 			spin_unlock_irq(&sch->lock);
-
-			if (fla_mask != 0)
-				break;
-			else
-				continue;
+			continue;
 		}
 		old_lpm = sch->lpm;
 		sch->lpm = ((sch->schib.pmcw.pim &
@@ -430,7 +426,7 @@ s390_process_res_acc (u8 chpid, __u16 fla, u32 fla_mask)
 
 		spin_unlock_irq(&sch->lock);
 		put_device(&sch->dev);
-		if (fla_mask != 0)
+		if (fla_mask == 0xffff)
 			break;
 	}
 	return rc;