diff options
author | Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 2006-10-04 14:02:26 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-10-04 14:02:26 -0400 |
commit | 3230015e15d4cf48e1df80fcf70d150f490cffe6 (patch) | |
tree | 407087fd8926a28c70ebcd5c6e7670324c8dac90 | |
parent | 0b2b6e1ddce4696cb7afcbb15a654fe95428a498 (diff) |
[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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c index e7eeaf1c1826..8994800dba4a 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, _ | |||
312 | 312 | ||
313 | sch = to_subchannel(cdev->dev.parent); | 313 | sch = to_subchannel(cdev->dev.parent); |
314 | do { | 314 | do { |
315 | ccw_device_set_timeout(cdev, 60 * HZ); | ||
315 | ret = cio_start (sch, ccw, lpm); | 316 | ret = cio_start (sch, ccw, lpm); |
317 | if (ret != 0) | ||
318 | ccw_device_set_timeout(cdev, 0); | ||
316 | if (ret == -EBUSY) { | 319 | if (ret == -EBUSY) { |
317 | /* Try again later. */ | 320 | /* Try again later. */ |
318 | spin_unlock_irq(&sch->lock); | 321 | spin_unlock_irq(&sch->lock); |