aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2006-08-07 17:00:30 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-08-07 17:00:30 +0200
commit4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f (patch)
tree6f504c1716d8710025e5a58153b90cd4f2d893f2 /drivers/s390
parent25a2001a285e187d99ea347693bedd73b3e0722a (diff)
downloadkernel_samsung_crespo-4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f.zip
kernel_samsung_crespo-4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f.tar.gz
kernel_samsung_crespo-4bc0c4f9e74e7a5d62ef4db923b377f2aa474a8f.tar.bz2
[S390] retry after deferred condition code.
Do a retry of read device characteristics / read configuration data when a deferred condition code 1 is encountered in ccw_device_wake_up(). Signed-off-by: Cornelia Huck <cornelia.huck@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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index a601242..9e3de0b 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -263,6 +263,9 @@ ccw_device_wake_up(struct ccw_device *cdev, unsigned long ip, struct irb *irb)
/* Abuse intparm for error reporting. */
if (IS_ERR(irb))
cdev->private->intparm = -EIO;
+ else if (irb->scsw.cc == 1)
+ /* Retry for deferred condition code. */
+ cdev->private->intparm = -EAGAIN;
else if ((irb->scsw.dstat !=
(DEV_STAT_CHN_END|DEV_STAT_DEV_END)) ||
(irb->scsw.cstat != 0)) {