1 files changed, 15 insertions, 19 deletions

diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c
index 160f22fa5941..82e42a80dc4b 100644
--- a/drivers/isdn/hysdn/boardergo.c
+++ b/drivers/isdn/hysdn/boardergo.c
@@ -45,11 +45,10 @@ ergo_interrupt(int intno, void *dev_id)
         if (!card->irq_enabled)
                 return IRQ_NONE;                /* other device interrupting or irq switched off */
 
-        save_flags(flags);
-        cli();                  /* no further irqs allowed */
+        spin_lock_irqsave(&card->hysdn_lock, flags); /* no further irqs allowed */
 
         if (!(bytein(card->iobase + PCI9050_INTR_REG) & PCI9050_INTR_REG_STAT1)) {
-                restore_flags(flags);   /* restore old state */
+                spin_unlock_irqrestore(&card->hysdn_lock, flags);       /* restore old state */
                 return IRQ_NONE;                /* no interrupt requested by E1 */
         }
         /* clear any pending ints on the board */
@@ -61,7 +60,7 @@ ergo_interrupt(int intno, void *dev_id)
         /* start kernel task immediately after leaving all interrupts */
         if (!card->hw_lock)
                 schedule_work(&card->irq_queue);
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
         return IRQ_HANDLED;
 }                               /* ergo_interrupt */
 
@@ -83,10 +82,9 @@ ergo_irq_bh(hysdn_card * card)
 
         dpr = card->dpram;      /* point to DPRAM */
 
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
         if (card->hw_lock) {
-                restore_flags(flags);   /* hardware currently unavailable */
+                spin_unlock_irqrestore(&card->hysdn_lock, flags);       /* hardware currently unavailable */
                 return;
         }
         card->hw_lock = 1;      /* we now lock the hardware */
@@ -120,7 +118,7 @@ ergo_irq_bh(hysdn_card * card)
                         card->hw_lock = 0;      /* free hardware again */
         } while (again);        /* until nothing more to do */
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
 }                               /* ergo_irq_bh */
 
 
@@ -137,8 +135,7 @@ ergo_stopcard(hysdn_card * card)
 #ifdef CONFIG_HYSDN_CAPI
         hycapi_capi_stop(card);
 #endif /* CONFIG_HYSDN_CAPI */
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
         val = bytein(card->iobase + PCI9050_INTR_REG);  /* get actual value */
         val &= ~(PCI9050_INTR_REG_ENPCI | PCI9050_INTR_REG_EN1);        /* mask irq */
         byteout(card->iobase + PCI9050_INTR_REG, val);
@@ -147,7 +144,7 @@ ergo_stopcard(hysdn_card * card)
         card->state = CARD_STATE_UNUSED;
         card->err_log_state = ERRLOG_STATE_OFF;         /* currently no log active */
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
 }                               /* ergo_stopcard */
 
 /**************************************************************************/
@@ -162,12 +159,11 @@ ergo_set_errlog_state(hysdn_card * card, int on)
                 card->err_log_state = ERRLOG_STATE_OFF;         /* must be off */
                 return;
         }
-        save_flags(flags);
-        cli();
+        spin_lock_irqsave(&card->hysdn_lock, flags);
 
         if (((card->err_log_state == ERRLOG_STATE_OFF) && !on) ||
             ((card->err_log_state == ERRLOG_STATE_ON) && on)) {
-                restore_flags(flags);
+                spin_unlock_irqrestore(&card->hysdn_lock, flags);
                 return;         /* nothing to do */
         }
         if (on)
@@ -175,7 +171,7 @@ ergo_set_errlog_state(hysdn_card * card, int on)
         else
                 card->err_log_state = ERRLOG_STATE_STOP;        /* request stop */
 
-        restore_flags(flags);
+        spin_unlock_irqrestore(&card->hysdn_lock, flags);
         schedule_work(&card->irq_queue);
 }                               /* ergo_set_errlog_state */
 
@@ -356,8 +352,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
 
                         if (card->debug_flags & LOG_POF_RECORD)
                                 hysdn_addlog(card, "ERGO: pof boot success");
-                        save_flags(flags);
-                        cli();
+                        spin_lock_irqsave(&card->hysdn_lock, flags);
 
                         card->state = CARD_STATE_RUN;   /* now card is running */
                         /* enable the cards interrupt */
@@ -370,7 +365,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
                         dpr->ToHyInt = 1;
                         dpr->ToPcInt = 1;       /* interrupt to E1 for all cards */
 
-                        restore_flags(flags);
+                        spin_unlock_irqrestore(&card->hysdn_lock, flags);
                         if ((hynet_enable & (1 << card->myid)) 
                             && (i = hysdn_net_create(card))) 
                         {
@@ -408,7 +403,7 @@ ergo_releasehardware(hysdn_card * card)
         free_irq(card->irq, card);      /* release interrupt */
         release_region(card->iobase + PCI9050_INTR_REG, 1);     /* release all io ports */
         release_region(card->iobase + PCI9050_USER_IO, 1);
-        vfree(card->dpram);
+        iounmap(card->dpram);
         card->dpram = NULL;     /* release shared mem */
 }                               /* ergo_releasehardware */
 
@@ -448,6 +443,7 @@ ergo_inithardware(hysdn_card * card)
         card->waitpofready = ergo_waitpofready;
         card->set_errlog_state = ergo_set_errlog_state;
         INIT_WORK(&card->irq_queue, (void *) (void *) ergo_irq_bh, card);
+        card->hysdn_lock = SPIN_LOCK_UNLOCKED;
 
         return (0);
 }                               /* ergo_inithardware */