aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorUrsula Braun-Krahl <braunu@de.ibm.com>2005-11-07 00:59:10 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:34 -0800
commitcdb32dc90bd38503befd1f4d0b762a1ace09bb28 (patch)
tree8db0224bf8cfe8e3b8efa58493f39f34ccb79645 /drivers/s390
parent4cd5b9f6df96494b8667deea71b61b66f783cca3 (diff)
downloadkernel_samsung_smdk4412-cdb32dc90bd38503befd1f4d0b762a1ace09bb28.zip
kernel_samsung_smdk4412-cdb32dc90bd38503befd1f4d0b762a1ace09bb28.tar.gz
kernel_samsung_smdk4412-cdb32dc90bd38503befd1f4d0b762a1ace09bb28.tar.bz2
[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>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/qdio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 381f339..ef5cd07 100644
--- 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;