1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index 5c4e741d8221..68be6e157126 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -95,9 +95,11 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
         }
 }
 
-static inline u32 shared_ind_set(void)
+static inline u32 clear_shared_ind(void)
 {
-        return q_indicators[TIQDIO_SHARED_IND].ind;
+        if (!atomic_read(&q_indicators[TIQDIO_SHARED_IND].count))
+                return 0;
+        return xchg(&q_indicators[TIQDIO_SHARED_IND].ind, 0);
 }
 
 /**
@@ -107,7 +109,7 @@ static inline u32 shared_ind_set(void)
  */
 static void tiqdio_thinint_handler(void *alsi, void *data)
 {
-        u32 si_used = shared_ind_set();
+        u32 si_used = clear_shared_ind();
         struct qdio_q *q;
 
         last_ai_time = S390_lowcore.int_clock;
@@ -150,13 +152,6 @@ static void tiqdio_thinint_handler(void *alsi, void *data)
                 qperf_inc(q, adapter_int);
         }
         rcu_read_unlock();
-
-        /*
-         * If the shared indicator was used clear it now after all queues
-         * were processed.
-         */
-        if (si_used && shared_ind_set())
-                xchg(&q_indicators[TIQDIO_SHARED_IND].ind, 0);
 }
 
 static int set_subchannel_ind(struct qdio_irq *irq_ptr, int reset)