Merge tag 'v3.10.106' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / s390 / cio / qdio_thinint.c

diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index bde5255200dc3864687fa955e69440503bd46b4b..1d1e585bd03468ce45c9f2f451fe17e94c7c55ef 100644 (file)
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -142,11 +142,11 @@ static inline void tiqdio_call_inq_handlers(struct qdio_irq *irq)
        struct qdio_q *q;
        int i;
 
-       for_each_input_queue(irq, q, i) {
-               if (!references_shared_dsci(irq) &&
-                   has_multiple_inq_on_dsci(irq))
-                       xchg(q->irq_ptr->dsci, 0);
+       if (!references_shared_dsci(irq) &&
+           has_multiple_inq_on_dsci(irq))
+               xchg(irq->dsci, 0);
 
+       for_each_input_queue(irq, q, i) {
                if (q->u.in.queue_start_poll) {
                        /* skip if polling is enabled or already in work */
                        if (test_and_set_bit(QDIO_QUEUE_IRQS_DISABLED,