Skip to contentSkip to conversation

s390: duplicate timeout in qdio.

PATCH In review Martin Schwidefsky 1 participant 1 message Oct 28, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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().

---

 drivers/s390/cio/qdio.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/s390/cio/qdio.c +4 -4
diff -urpN linux-2.6/drivers/s390/cio/qdio.c linux-2.6-patched/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 <[email protected]>");
@@ -2873,10 +2873,10 @@ qdio_establish(struct qdio_initialize *i
 		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;