1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/s390/cio/airq.c b/drivers/s390/cio/airq.c
index 445564c790f6..00bfbee0af9e 100644
--- a/drivers/s390/cio/airq.c
+++ b/drivers/s390/cio/airq.c
@@ -196,11 +196,11 @@ EXPORT_SYMBOL(airq_iv_release);
  */
 unsigned long airq_iv_alloc(struct airq_iv *iv, unsigned long num)
 {
-        unsigned long bit, i;
+        unsigned long bit, i, flags;
 
         if (!iv->avail || num == 0)
                 return -1UL;
-        spin_lock(&iv->lock);
+        spin_lock_irqsave(&iv->lock, flags);
         bit = find_first_bit_inv(iv->avail, iv->bits);
         while (bit + num <= iv->bits) {
                 for (i = 1; i < num; i++)
@@ -218,9 +218,8 @@ unsigned long airq_iv_alloc(struct airq_iv *iv, unsigned long num)
         }
         if (bit + num > iv->bits)
                 bit = -1UL;
-        spin_unlock(&iv->lock);
+        spin_unlock_irqrestore(&iv->lock, flags);
         return bit;
-
 }
 EXPORT_SYMBOL(airq_iv_alloc);
 
@@ -232,11 +231,11 @@ EXPORT_SYMBOL(airq_iv_alloc);
  */
 void airq_iv_free(struct airq_iv *iv, unsigned long bit, unsigned long num)
 {
-        unsigned long i;
+        unsigned long i, flags;
 
         if (!iv->avail || num == 0)
                 return;
-        spin_lock(&iv->lock);
+        spin_lock_irqsave(&iv->lock, flags);
         for (i = 0; i < num; i++) {
                 /* Clear (possibly left over) interrupt bit */
                 clear_bit_inv(bit + i, iv->vector);
@@ -248,7 +247,7 @@ void airq_iv_free(struct airq_iv *iv, unsigned long bit, unsigned long num)
                 while (iv->end > 0 && !test_bit_inv(iv->end - 1, iv->avail))
                         iv->end--;
         }
-        spin_unlock(&iv->lock);
+        spin_unlock_irqrestore(&iv->lock, flags);
 }
 EXPORT_SYMBOL(airq_iv_free);