aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorPeter Oberparleiter <peter.oberparleiter@de.ibm.com>2009-03-26 15:24:18 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-03-26 15:24:17 +0100
commit7a968f0565dc5d0518c784465cc8ce32408102b7 (patch)
tree01b009632b10e00283832d57dbd4ff49367b8432 /drivers/s390
parent17e7d87d9f88480a75fc9c5978ab38131a074277 (diff)
downloadkernel_samsung_smdk4412-7a968f0565dc5d0518c784465cc8ce32408102b7.zip
kernel_samsung_smdk4412-7a968f0565dc5d0518c784465cc8ce32408102b7.tar.gz
kernel_samsung_smdk4412-7a968f0565dc5d0518c784465cc8ce32408102b7.tar.bz2
[S390] cio: incorrect status check in interrogate function
Fix incorrect check for active I/O in interrogate function. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/device_ops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index eabcc42..151754d 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -680,7 +680,7 @@ int ccw_device_tm_intrg(struct ccw_device *cdev)
if (cdev->private->state != DEV_STATE_ONLINE)
return -EIO;
if (!scsw_is_tm(&sch->schib.scsw) ||
- !(scsw_actl(&sch->schib.scsw) | SCSW_ACTL_START_PEND))
+ !(scsw_actl(&sch->schib.scsw) & SCSW_ACTL_START_PEND))
return -EINVAL;
return cio_tm_intrg(sch);
}