This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / isdn / hardware / avm / c4.c

diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 0e40aca..72b57d4 100644 (file)
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -662,16 +662,15 @@ static void c4_handle_rx(avmcard *card)
 
 static irqreturn_t c4_handle_interrupt(avmcard *card)
 {
-       unsigned long flags;
        u32 status;
 
-       spin_lock_irqsave(&card->lock, flags);
+       spin_lock(&card->lock);
        status = c4inmeml(card->mbase+DOORBELL);
 
        if (status & DBELL_RESET_HOST) {
                u_int i;
                c4outmeml(card->mbase+PCI_OUT_INT_MASK, 0x0c);
-               spin_unlock_irqrestore(&card->lock, flags);
+               spin_unlock(&card->lock);
                if (card->nlogcontr == 0)
                        return IRQ_HANDLED;
                printk(KERN_ERR "%s: unexpected reset\n", card->name);
@@ -687,7 +686,7 @@ static irqreturn_t c4_handle_interrupt(avmcard *card)
 
        status &= (DBELL_UP_HOST | DBELL_DOWN_HOST);
        if (!status) {
-               spin_unlock_irqrestore(&card->lock, flags);
+               spin_unlock(&card->lock);
                return IRQ_HANDLED;
        }
        c4outmeml(card->mbase+DOORBELL, status);
@@ -710,7 +709,7 @@ static irqreturn_t c4_handle_interrupt(avmcard *card)
                        c4_dispatch_tx(card);
                }
        }
-       spin_unlock_irqrestore(&card->lock, flags);
+       spin_unlock(&card->lock);
        return IRQ_HANDLED;
 }