s390/cio: clear timer when terminating driver I/O

Sebastian Ott · Martin Schwidefsky · commit 410d5e13e763 · 2018-02-22T10:09:27.000+01:00
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 &lt;sebott@linux.vnet.ibm.com&gt;
Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -896,6 +896,7 @@ void ccw_device_kill_io(struct ccw_device *cdev)`
`896`	`896`	`{`
`897`	`897`	`int ret;`
`898`	`898`
	`899`	`+ ccw_device_set_timeout(cdev, 0);`
`899`	`900`	`cdev->private->iretry = 255;`
`900`	`901`	`cdev->private->async_kill_io_rc = -EIO;`
`901`	`902`	`ret = ccw_device_cancel_halt_clear(cdev);`