git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
s390
/
cio
/
css.c
diff --git
a/drivers/s390/cio/css.c
b/drivers/s390/cio/css.c
index
64f2594
..
dd12416
100644
(file)
--- a/
drivers/s390/cio/css.c
+++ b/
drivers/s390/cio/css.c
@@
-1,7
+1,7
@@
/*
* drivers/s390/cio/css.c
* driver for channel subsystem
/*
* drivers/s390/cio/css.c
* driver for channel subsystem
- * $Revision: 1.8
4
$
+ * $Revision: 1.8
2
$
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
@@
-188,12
+188,6
@@
css_evaluate_subchannel(int irq, int slow)
put_device(&sch->dev);
return 0; /* Already processed. */
}
put_device(&sch->dev);
return 0; /* Already processed. */
}
- /*
- * We've got a machine check, so running I/O won't get an interrupt.
- * Kill any pending timers.
- */
- if (sch)
- device_kill_pending_timer(sch);
if (!disc && !slow) {
if (sch)
put_device(&sch->dev);
if (!disc && !slow) {
if (sch)
put_device(&sch->dev);