summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Oberparleiter <peter.oberparleiter@de.ibm.com>2006-10-04 20:02:26 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-10-04 20:02:26 +0200
commit3230015e15d4cf48e1df80fcf70d150f490cffe6 (patch)
tree407087fd8926a28c70ebcd5c6e7670324c8dac90
parent0b2b6e1ddce4696cb7afcbb15a654fe95428a498 (diff)
downloadlinux-3.10-3230015e15d4cf48e1df80fcf70d150f490cffe6.tar.gz
linux-3.10-3230015e15d4cf48e1df80fcf70d150f490cffe6.tar.bz2
linux-3.10-3230015e15d4cf48e1df80fcf70d150f490cffe6.zip
[S390] cio: add timeout handler for internal operations.
Add timeout handler for common-I/O-layer-internal I/O operations. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-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 e7eeaf1c182..8994800dba4 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -312,7 +312,10 @@ __ccw_device_retry_loop(struct ccw_device *cdev, struct ccw1 *ccw, long magic, _
sch = to_subchannel(cdev->dev.parent);
do {
+ ccw_device_set_timeout(cdev, 60 * HZ);
ret = cio_start (sch, ccw, lpm);
+ if (ret != 0)
+ ccw_device_set_timeout(cdev, 0);
if (ret == -EBUSY) {
/* Try again later. */
spin_unlock_irq(&sch->lock);