summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/via-macii.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/macintosh/via-macii.c')
-rw-r--r--drivers/macintosh/via-macii.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index b6ddf1d47..db9270da5 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -140,19 +140,24 @@ static int macii_probe(void)
/* Initialize the driver */
static int macii_init(void)
{
+ unsigned long flags;
int err;
+ local_irq_save(flags);
+
err = macii_init_via();
if (err)
- return err;
+ goto out;
err = request_irq(IRQ_MAC_ADB, macii_interrupt, 0, "ADB",
macii_interrupt);
if (err)
- return err;
+ goto out;
macii_state = idle;
- return 0;
+out:
+ local_irq_restore(flags);
+ return err;
}
/* initialize the hardware */