Commit 258634d5 authored Nov 18, 2022 by Chen Jun Committed by sanglipeng Jul 20, 2023

Input: i8042 - fix leaking of platform device on module removal

stable inclusion
from stable-v5.10.156
commit 3f25add5ecf88de0f8ff2b27b6c0731a1f1b38ed
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7MCG1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3f25add5ecf88de0f8ff2b27b6c0731a1f1b38ed



--------------------------------

[ Upstream commit 81cd7e84 ]

Avoid resetting the module-wide i8042_platform_device pointer in
i8042_probe() or i8042_remove(), so that the device can be properly
destroyed by i8042_exit() on module unload.

Fixes: 9222ba68 ("Input: i8042 - add deferred probe support")
Signed-off-by: Chen Jun <chenjun102@huawei.com>
Link: https://lore.kernel.org/r/20221109034148.23821-1-chenjun102@huawei.com


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent b69c0111

drivers/input/serio/i8042.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1543,8 +1543,6 @@ static int i8042_probe(struct platform_device *dev)
		{
		int error;

		i8042_platform_device = dev;

		if (i8042_reset == I8042_RESET_ALWAYS) {
		error = i8042_controller_selftest();
		if (error)
		@@ -1582,7 +1580,6 @@ static int i8042_probe(struct platform_device *dev)
		i8042_free_aux_ports(); /* in case KBD failed but AUX not */
		i8042_free_irqs();
		i8042_controller_reset(false);
		i8042_platform_device = NULL;

		return error;
		}
		@@ -1592,7 +1589,6 @@ static int i8042_remove(struct platform_device *dev)
		i8042_unregister_ports();
		i8042_free_irqs();
		i8042_controller_reset(false);
		i8042_platform_device = NULL;

		return 0;
		}