From 30471808f7148e79b6b5ce711c3374b7a6617ecd Mon Sep 17 00:00:00 2001 From: Peter Oberparleiter Date: Thu, 26 Mar 2009 15:24:18 +0100 Subject: [PATCH] --- yaml --- r: 135621 b: refs/heads/master c: 7a968f0565dc5d0518c784465cc8ce32408102b7 h: refs/heads/master i: 135619: cd34f4df0373ac05b9968a7c11ab494cd941ae4b v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/device_ops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b6e32f9e0f19..0b62cc11aac9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17e7d87d9f88480a75fc9c5978ab38131a074277 +refs/heads/master: 7a968f0565dc5d0518c784465cc8ce32408102b7 diff --git a/trunk/drivers/s390/cio/device_ops.c b/trunk/drivers/s390/cio/device_ops.c index eabcc42d63df..151754d54745 100644 --- a/trunk/drivers/s390/cio/device_ops.c +++ b/trunk/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); }