1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 2d48196a48c..0f4cc3f0002 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -146,7 +146,6 @@ static irqreturn_t db1200_pcmcia_cdirq(int irq, void *data)
 static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock)
 {
         int ret;
-        unsigned long flags;
 
         if (sock->stschg_irq != -1) {
                 ret = request_irq(sock->stschg_irq, db1000_pcmcia_stschgirq,
@@ -162,30 +161,23 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock)
          * active one disabled.
          */
         if (sock->board_type == BOARD_TYPE_DB1200) {
-                local_irq_save(flags);
-
                 ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq,
                                   IRQF_DISABLED, "pcmcia_insert", sock);
-                if (ret) {
-                        local_irq_restore(flags);
+                if (ret)
                         goto out1;
-                }
 
                 ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq,
                                   IRQF_DISABLED, "pcmcia_eject", sock);
                 if (ret) {
                         free_irq(sock->insert_irq, sock);
-                        local_irq_restore(flags);
                         goto out1;
                 }
 
-                /* disable the currently active one */
+                /* enable the currently silent one */
                 if (db1200_card_inserted(sock))
-                        disable_irq_nosync(sock->insert_irq);
+                        enable_irq(sock->eject_irq);
                 else
-                        disable_irq_nosync(sock->eject_irq);
-
-                local_irq_restore(flags);
+                        enable_irq(sock->insert_irq);
         } else {
                 /* all other (older) Db1x00 boards use a GPIO to show
                  * card detection status:  use both-edge triggers.