1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 93a897eebfff..e7eeaf1c1826 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -216,6 +216,9 @@ ccw_device_call_handler(struct ccw_device *cdev)
               (stctl & SCSW_STCTL_PRIM_STATUS)))
                 return 0;
 
+        /* Clear pending timers for device driver initiated I/O. */
+        if (ending_status)
+                ccw_device_set_timeout(cdev, 0);
         /*
          * Now we are ready to call the device driver interrupt handler.
          */