summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2008-01-26 14:10:49 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-01-26 14:11:04 +0100
commit46258ab5e42eed5cbe20a83b732d6538c49ea2fe (patch)
treec36a79cc587ef251604a62e6c929b45087de5f07 /drivers/s390
parente82a1567e4b22eb035da2499d20ddd573c9acf75 (diff)
downloadop-kernel-dev-46258ab5e42eed5cbe20a83b732d6538c49ea2fe.zip
op-kernel-dev-46258ab5e42eed5cbe20a83b732d6538c49ea2fe.tar.gz
[S390] cio: Delete timer in ccw_device_verify_done().
Make sure pending timers are always deleted, even if we don't go through ccw_device_done(). Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/device_fsm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 669e6a7..485741a 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -641,9 +641,10 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
default:
/* Reset oper notify indication after verify error. */
cdev->private->flags.donotify = 0;
- if (cdev->online)
+ if (cdev->online) {
+ ccw_device_set_timeout(cdev, 0);
dev_fsm_event(cdev, DEV_EVENT_NOTOPER);
- else
+ } else
ccw_device_done(cdev, DEV_STATE_NOT_OPER);
break;
}
OpenPOWER on IntegriCloud