s390: duplicate timeout in qdio.
Subsystems (2)
PATCH 12/14 s390: duplicate timeout in qdio.
From: Ursula Braun-Krahl <[email protected]>
[patch 12/14] s390: duplicate timeout in qdio.
Remove duplicate timeout in qdio_establish().
Signed-off-by Ursula Braun-Krahl <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
drivers/s390/cio/qdio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/s390/cio/qdio.c +4 -4
@@ -56,7 +56,7 @@#include "ioasm.h" #include "chsc.h" -#define VERSION_QDIO_C "$Revision: 1.101 $" +#define VERSION_QDIO_C "$Revision: 1.108 $"/****************** MODULE PARAMETER VARIABLES ********************/ MODULE_AUTHOR ("Utz Bacher <[email protected]>" );
@@ -2873,10 +2873,10 @@ qdio_establish(struct qdio_initialize *ireturn result; } -wait_event_interruptible_timeout (cdev->private->wait_q, +/* Timeout is cared for already by using ccw_device_start_timeout(). */ +wait_event_interruptible (cdev->private->wait_q, irq_ptr->state ==QDIO_IRQ_STATE_ESTABLISHED || - irq_ptr->state ==QDIO_IRQ_STATE_ERR , -QDIO_ESTABLISH_TIMEOUT ); + irq_ptr->state ==QDIO_IRQ_STATE_ERR );if (irq_ptr->state ==QDIO_IRQ_STATE_ESTABLISHED ) result =0 ;