OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e82a156
)
[S390] cio: Delete timer in ccw_device_verify_done().
author
Cornelia Huck
<cornelia.huck@de.ibm.com>
Sat, 26 Jan 2008 13:10:49 +0000
(14:10 +0100)
committer
Martin Schwidefsky
<schwidefsky@de.ibm.com>
Sat, 26 Jan 2008 13:11:04 +0000
(14:11 +0100)
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>
drivers/s390/cio/device_fsm.c
patch
|
blob
|
history
diff --git
a/drivers/s390/cio/device_fsm.c
b/drivers/s390/cio/device_fsm.c
index
669e6a7
..
485741a
100644
(file)
--- 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;
}