Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb32dc9 authored by Ursula Braun-Krahl's avatar Ursula Braun-Krahl Committed by Linus Torvalds
Browse files

[PATCH] s390: duplicate timeout in qdio 



Remove duplicate timeout in qdio_establish().

Signed-off-by: default avatarUrsula Braun-Krahl <braunu@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4cd5b9f6

drivers/s390/cio/qdio.c

+4 −4
Original line number Diff line number Diff line
@@ -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;