OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

macintosh/via-macii: Access autopoll_devs when inside lock

Browse Source 
[ Upstream commit 59ea38f6b3 ]

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

Fixes: d95fd5fce8 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Finn Thain 2020-06-28 14:23:12 +10:00 committed by Greg Kroah-Hartman
parent a88f86763c
commit 8456017563
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/macintosh/via-macii.c
View File

@ -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.
*/