diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2018-02-12 12:01:03 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-02-22 10:09:27 +0100 |
| commit | 410d5e13e7638bc146321671e223d56495fbf3c7 (patch) | |
| tree | 0e14ba1fa2b251274c0380842993e631d5d80ef8 /drivers/s390/cio/device_fsm.c | |
| parent | s390/cio: fix return code after missing interrupt (diff) | |
| download | linux-410d5e13e7638bc146321671e223d56495fbf3c7.tar.xz linux-410d5e13e7638bc146321671e223d56495fbf3c7.zip | |
s390/cio: clear timer when terminating driver I/O
When we terminate driver I/O (because we need to stop using a certain
channel path) we also need to ensure that a timer (which may have been
set up using ccw_device_start_timeout) is cleared.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/device_fsm.c')
| -rw-r--r-- | drivers/s390/cio/device_fsm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 384f085698a7..9169af7dbb43 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c @@ -896,6 +896,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); |