From a70de7ce9f92fd9b27a985c59216dbc6841d8432 Mon Sep 17 00:00:00 2001 From: Peter Oberparleiter Date: Wed, 4 Oct 2006 20:02:30 +0200 Subject: [PATCH] --- yaml --- r: 38931 b: refs/heads/master c: 3bdc9d0b408e01c4e556daba0035ba37f603e920 h: refs/heads/master i: 38929: 10f6de34b6d7d0dd162adf72034ebfe4bf73f786 38927: de5c1b390adde757f09198498b28b800b0d1f236 v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/device_ops.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1eff4dcc1d86..13f1ecb7edf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3230015e15d4cf48e1df80fcf70d150f490cffe6 +refs/heads/master: 3bdc9d0b408e01c4e556daba0035ba37f603e920 diff --git a/trunk/drivers/s390/cio/device_ops.c b/trunk/drivers/s390/cio/device_ops.c index 8994800dba4a..84b9b18eabc2 100644 --- a/trunk/drivers/s390/cio/device_ops.c +++ b/trunk/drivers/s390/cio/device_ops.c @@ -288,10 +288,10 @@ ccw_device_wake_up(struct ccw_device *cdev, unsigned long ip, struct irb *irb) if (cdev->private->flags.doverify || cdev->private->state == DEV_STATE_VERIFY) cdev->private->intparm = -EAGAIN; - if ((irb->scsw.dstat & DEV_STAT_UNIT_CHECK) && - !(irb->ecw[0] & - (SNS0_CMD_REJECT | SNS0_INTERVENTION_REQ))) - cdev->private->intparm = -EAGAIN; + else if ((irb->scsw.dstat & DEV_STAT_UNIT_CHECK) && + !(irb->ecw[0] & + (SNS0_CMD_REJECT | SNS0_INTERVENTION_REQ))) + cdev->private->intparm = -EAGAIN; else if ((irb->scsw.dstat & DEV_STAT_ATTENTION) && (irb->scsw.dstat & DEV_STAT_DEV_END) && (irb->scsw.dstat & DEV_STAT_UNIT_EXCEP))