Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e9c3f2c authored by Finn Thain's avatar Finn Thain Committed by Greg Kroah-Hartman
Browse files

macintosh/via-macii: Fix "BUG: sleeping function called from invalid context" 



[ Upstream commit d301a71c76ee4c384b4e03cdc320a55f5cf1df05 ]

The via-macii ADB driver calls request_irq() after disabling hard
interrupts. But disabling interrupts isn't necessary here because the
VIA shift register interrupt was masked during VIA1 initialization.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarFinn Thain <fthain@linux-m68k.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/419fcc09d0e563b425c419053d02236b044d86b0.1710298421.git.fthain@linux-m68k.org


Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 31e1da77

drivers/macintosh/via-macii.c

+3 −8
Original line number Diff line number Diff line
@@ -135,24 +135,19 @@ static int macii_probe(void) 
/* Initialize the driver */

int macii_init(void)

{

	unsigned long flags;

	int err;



	local_irq_save(flags);



	err = macii_init_via();

	if (err)

		goto out;

		return err;



	err = request_irq(IRQ_MAC_ADB, macii_interrupt, 0, "ADB",

			  macii_interrupt);

	if (err)

		goto out;

		return err;



	macii_state = idle;

out:

	local_irq_restore(flags);

	return err;

	return 0;

}



/* initialize the hardware */