diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2020-06-28 06:23:12 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-26 15:34:24 +0200 |
| commit | 59ea38f6b3af5636edf541768a1ed721eeaca99e (patch) | |
| tree | b0eedeae83591bd715316fd64ae2712e9b7d9ad1 /drivers/macintosh/via-macii.c | |
| parent | macintosh/adb-iop: Implement SRQ autopolling (diff) | |
| download | linux-59ea38f6b3af5636edf541768a1ed721eeaca99e.tar.xz linux-59ea38f6b3af5636edf541768a1ed721eeaca99e.zip | |
macintosh/via-macii: Access autopoll_devs when inside lock
The interrupt handler should be excluded when accessing the autopoll_devs
variable.
Fixes: d95fd5fce88f0 ("m68k: Mac II ADB fixes") # v5.0+
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5952dd8a9bc9de90f1acc4790c51dd42b4c98065.1593318192.git.fthain@telegraphics.com.au
Diffstat (limited to 'drivers/macintosh/via-macii.c')
| -rw-r--r-- | drivers/macintosh/via-macii.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c index ac824d7b2dcf..6aa903529570 100644 --- a/drivers/macintosh/via-macii.c +++ b/drivers/macintosh/via-macii.c @@ -270,15 +270,12 @@ static int macii_autopoll(int devs) unsigned long flags; int err = 0; + local_irq_save(flags); + /* bit 1 == device 1, and so on. */ autopoll_devs = devs & 0xFFFE; - if (!autopoll_devs) - return 0; - - local_irq_save(flags); - - if (current_req == NULL) { + if (autopoll_devs && !current_req) { /* Send a Talk Reg 0. The controller will repeatedly transmit * this as long as it is idle. */ |