From 92219e6532140240469673b68cceaa4c2ec668a3 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Mon, 5 Nov 2007 11:10:12 +0100
Subject: [PATCH] --- yaml --- r: 73135 b: refs/heads/master c:
 b2eaee6e81696d80d9c6ecfcbba8951673e83934 h: refs/heads/master i:   73133:
 6424d1524d5eb3b4d21127c0f6a673a8de13125d   73131:
 3ed4dfd1658bfee7c410f2ac95044d132350e131   73127:
 fc177d7779048a33d0c36c1b65980a82a9de0ff4   73119:
 1b96d463f490634a847cfe85fcff83daf9560a8d v: v3

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

diff --git a/[refs] b/[refs]
index bd3427142981..1dfd9f887675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b8da654b6c13b40b0e0efd916ee57ed13f9fa1f
+refs/heads/master: b2eaee6e81696d80d9c6ecfcbba8951673e83934
diff --git a/trunk/drivers/s390/cio/cmf.c b/trunk/drivers/s390/cio/cmf.c
index 725b0dd14269..f4c132ab39ed 100644
--- a/trunk/drivers/s390/cio/cmf.c
+++ b/trunk/drivers/s390/cio/cmf.c
@@ -343,10 +343,10 @@ static int cmf_copy_block(struct ccw_device *cdev)
 
 	if (sch->schib.scsw.fctl & SCSW_FCTL_START_FUNC) {
 		/* Don't copy if a start function is in progress. */
-		if ((!sch->schib.scsw.actl & SCSW_ACTL_SUSPENDED) &&
+		if ((!(sch->schib.scsw.actl & SCSW_ACTL_SUSPENDED)) &&
 		    (sch->schib.scsw.actl &
 		     (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) &&
-		    (!sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS))
+		    (!(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)))
 			return -EBUSY;
 	}
 	cmb_data = cdev->private->cmb;