Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-08-02 16:12:25 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2018-08-03 09:55:59 +0200
commitb207c193e42c77c2fcd608c80e23c7d8a0df48b3 (patch)
tree0aaad13b45b0795293cda362d09e060abcef1f67
parentfd27f6788ff4dfbe015e340236f1b2921c01bb54 (diff)
s390/cio: clear timer when terminating driver I/O (bsc#1103421).
-rw-r--r--drivers/s390/cio/device_fsm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index ccf1e15803f4..e69f88b5bbc0 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -885,6 +885,7 @@ void ccw_device_kill_io(struct ccw_device *cdev)
{
int ret;
+ ccw_device_set_timeout(cdev, 0);
cdev->private->iretry = 255;
cdev->private->async_kill_io_rc = -EIO;
ret = ccw_device_cancel_halt_clear(cdev);