diff options
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/cio/qdio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index 381f339e3200..ef5cd07011bb 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #include "ioasm.h" | 56 | #include "ioasm.h" |
57 | #include "chsc.h" | 57 | #include "chsc.h" |
58 | 58 | ||
59 | #define VERSION_QDIO_C "$Revision: 1.101 $" | 59 | #define VERSION_QDIO_C "$Revision: 1.108 $" |
60 | 60 | ||
61 | /****************** MODULE PARAMETER VARIABLES ********************/ | 61 | /****************** MODULE PARAMETER VARIABLES ********************/ |
62 | MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>"); | 62 | MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>"); |
@@ -2873,10 +2873,10 @@ qdio_establish(struct qdio_initialize *init_data) | |||
2873 | return result; | 2873 | return result; |
2874 | } | 2874 | } |
2875 | 2875 | ||
2876 | wait_event_interruptible_timeout(cdev->private->wait_q, | 2876 | /* Timeout is cared for already by using ccw_device_start_timeout(). */ |
2877 | wait_event_interruptible(cdev->private->wait_q, | ||
2877 | irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED || | 2878 | irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED || |
2878 | irq_ptr->state == QDIO_IRQ_STATE_ERR, | 2879 | irq_ptr->state == QDIO_IRQ_STATE_ERR); |
2879 | QDIO_ESTABLISH_TIMEOUT); | ||
2880 | 2880 | ||
2881 | if (irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED) | 2881 | if (irq_ptr->state == QDIO_IRQ_STATE_ESTABLISHED) |
2882 | result = 0; | 2882 | result = 0; |