diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2008-01-26 08:10:49 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-01-26 08:11:04 -0500 |
commit | 46258ab5e42eed5cbe20a83b732d6538c49ea2fe (patch) | |
tree | c36a79cc587ef251604a62e6c929b45087de5f07 /drivers/s390/cio/device_fsm.c | |
parent | e82a1567e4b22eb035da2499d20ddd573c9acf75 (diff) |
[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/cio/device_fsm.c')
-rw-r--r-- | drivers/s390/cio/device_fsm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index 669e6a75f54f..485741a12125 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) | |||
641 | default: | 641 | default: |
642 | /* Reset oper notify indication after verify error. */ | 642 | /* Reset oper notify indication after verify error. */ |
643 | cdev->private->flags.donotify = 0; | 643 | cdev->private->flags.donotify = 0; |
644 | if (cdev->online) | 644 | if (cdev->online) { |
645 | ccw_device_set_timeout(cdev, 0); | ||
645 | dev_fsm_event(cdev, DEV_EVENT_NOTOPER); | 646 | dev_fsm_event(cdev, DEV_EVENT_NOTOPER); |
646 | else | 647 | } else |
647 | ccw_device_done(cdev, DEV_STATE_NOT_OPER); | 648 | ccw_device_done(cdev, DEV_STATE_NOT_OPER); |
648 | break; | 649 | break; |
649 | } | 650 | } |