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

Commit 74af42bb authored by Kurt Garloff's avatar Kurt Garloff Committed by Dmitry Torokhov
Browse files

Input: Avoid double unregistering of i8042 PnP driver. This can happen 


       when no i8042 controller (not PnP, not legacy) is present.

From: Kurt Garloff <garloff@suse.de>
Signed-off-by: default avatarVojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 5a72afc0

drivers/input/serio/i8042-x86ia64io.h

+6 −2
Original line number Diff line number Diff line
@@ -215,12 +215,16 @@ static struct pnp_driver i8042_pnp_aux_driver = { 


static void i8042_pnp_exit(void)

{

	if (i8042_pnp_kbd_registered)

	if (i8042_pnp_kbd_registered) {

		i8042_pnp_kbd_registered = 0;

		pnp_unregister_driver(&i8042_pnp_kbd_driver);

	}



	if (i8042_pnp_aux_registered)

	if (i8042_pnp_aux_registered) {

		i8042_pnp_aux_registered = 0;

		pnp_unregister_driver(&i8042_pnp_aux_driver);

	}

}



static int i8042_pnp_init(void)

{