[PATCH] s390: duplicate timeout in qdio

Remove duplicate timeout in qdio_establish().

Signed-off-by: Ursula Braun-Krahl <braunu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 381f339e3200a9d98d2031d1d30495c18e713a62..ef5cd07011bb478e84c602c4e8d5cd5fdebb73e8 100644 (file)
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -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 <utz.bacher@de.ibm.com>");
@@ -2873,10 +2873,10 @@ qdio_establish(struct qdio_initialize *init_data)
                return 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;