iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: i8042 - fix refount leak on sparc

Browse Source 
In i8042_platform_init() and i8042_platform_exit(), we should call
of_node_put() for the reference 'root' returned by
of_find_node_by_path() which has increased the refcount.

Fixes: f57caaefac ("[SERIO] i8042-sparcio.h: Convert to of_driver framework.")
Signed-off-by: Liang He <windhl@126.com>
Link: https://lore.kernel.org/r/20220711064300.358757-1-windhl@126.com
[dtor: rearranged i8042_is_mr_coffee() a bit]
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Liang He
2022-10-01 14:42:24 -07:00
committed by Dmitry Torokhov
parent fdd7c96176
commit fe5b6aaef7
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/input/serio/i8042-sparcio.h
View File

@ -3,6 +3,7 @@
#define _I8042_SPARCIO_H #define _I8042_SPARCIO_H
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/oplib.h> #include <asm/oplib.h>
@ -103,12 +104,25 @@ static struct platform_driver sparc_i8042_driver = {
.remove = sparc_i8042_remove, .remove = sparc_i8042_remove,
}; };
static bool i8042_is_mr_coffee(void)
{
struct device_node *root;
const char *name;
bool is_mr_coffee;
root = of_find_node_by_path("/");
name = of_get_property(root, "name", NULL);
is_mr_coffee = name && !strcmp(name, "SUNW,JavaStation-1");
of_node_put(root);
return is_mr_coffee;
}
static int __init i8042_platform_init(void) static int __init i8042_platform_init(void)
{ {
struct device_node *root = of_find_node_by_path("/"); if (i8042_is_mr_coffee()) {
const char *name = of_get_property(root, "name", NULL);
if (name && !strcmp(name, "SUNW,JavaStation-1")) {
/* Hardcoded values for MrCoffee. */ /* Hardcoded values for MrCoffee. */
i8042_kbd_irq = i8042_aux_irq = 13 | 0x20; i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;
kbd_iobase = ioremap(0x71300060, 8); kbd_iobase = ioremap(0x71300060, 8);
@ -136,10 +150,7 @@ static int __init i8042_platform_init(void)
static inline void i8042_platform_exit(void) static inline void i8042_platform_exit(void)
{ {
struct device_node *root = of_find_node_by_path("/"); if (!i8042_is_mr_coffee())
const char *name = of_get_property(root, "name", NULL);
if (!name || strcmp(name, "SUNW,JavaStation-1"))
platform_driver_unregister(&sparc_i8042_driver); platform_driver_unregister(&sparc_i8042_driver);
} }