diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 21:00:51 +0000 |
| commit | 6d03a247468059b0e59c821ef39e6762d4d6fc30 (patch) | |
| tree | 17b9c00de2c62e68c965c742cdbc206f77a375da /drivers/macintosh/via-macii.c | |
| parent | Releasing progress-linux version 6.8.12-1~progress7.99u1. (diff) | |
| download | linux-6d03a247468059b0e59c821ef39e6762d4d6fc30.tar.xz linux-6d03a247468059b0e59c821ef39e6762d4d6fc30.zip | |
Merging upstream version 6.9.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/macintosh/via-macii.c')
| -rw-r--r-- | drivers/macintosh/via-macii.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c index b6ddf1d47c..db9270da5b 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 */ |