From: Peter Oberparleiter Date: Wed, 4 Oct 2006 18:02:26 +0000 (+0200) Subject: [S390] cio: add timeout handler for internal operations. X-Git-Tag: v2.6.19-rc1~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3230015e15d4cf48e1df80fcf70d150f490cffe6;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Martin Schwidefsky --- 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);