Commit 59ea38f6 authored by Finn Thain's avatar Finn Thain Committed by Michael Ellerman

macintosh/via-macii: Access autopoll_devs when inside lock

The interrupt handler should be excluded when accessing the autopoll_devs
variable.

Fixes: d95fd5fc ("m68k: Mac II ADB fixes") # v5.0+
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5952dd8a9bc9de90f1acc4790c51dd42b4c98065.1593318192.git.fthain@telegraphics.com.au
parent c66da95a
...@@ -270,15 +270,12 @@ static int macii_autopoll(int devs) ...@@ -270,15 +270,12 @@ static int macii_autopoll(int devs)
unsigned long flags; unsigned long flags;
int err = 0; int err = 0;
local_irq_save(flags);
/* bit 1 == device 1, and so on. */ /* bit 1 == device 1, and so on. */
autopoll_devs = devs & 0xFFFE; autopoll_devs = devs & 0xFFFE;
if (!autopoll_devs) if (autopoll_devs && !current_req) {
return 0;
local_irq_save(flags);
if (current_req == NULL) {
/* Send a Talk Reg 0. The controller will repeatedly transmit /* Send a Talk Reg 0. The controller will repeatedly transmit
* this as long as it is idle. * this as long as it is idle.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment