Skip to content

Commit

Permalink
Input: i8042 - fix refount leak on sparc
Browse files Browse the repository at this point in the history
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: f57caae ("[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>
  • Loading branch information
Liang He authored and Dmitry Torokhov committed Oct 10, 2022
1 parent fdd7c96 commit fe5b6aa
Showing 1 changed file with 19 additions and 8 deletions.
27 changes: 19 additions & 8 deletions drivers/input/serio/i8042-sparcio.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define _I8042_SPARCIO_H

#include <linux/of_device.h>
#include <linux/types.h>

#include <asm/io.h>
#include <asm/oplib.h>
Expand Down Expand Up @@ -103,12 +104,25 @@ static struct platform_driver sparc_i8042_driver = {
.remove = sparc_i8042_remove,
};

static int __init i8042_platform_init(void)
static bool i8042_is_mr_coffee(void)
{
struct device_node *root = of_find_node_by_path("/");
const char *name = of_get_property(root, "name", NULL);
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");

if (name && !strcmp(name, "SUNW,JavaStation-1")) {
of_node_put(root);

return is_mr_coffee;
}

static int __init i8042_platform_init(void)
{
if (i8042_is_mr_coffee()) {
/* Hardcoded values for MrCoffee. */
i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;
kbd_iobase = ioremap(0x71300060, 8);
Expand Down Expand Up @@ -136,10 +150,7 @@ static int __init i8042_platform_init(void)

static inline void i8042_platform_exit(void)
{
struct device_node *root = of_find_node_by_path("/");
const char *name = of_get_property(root, "name", NULL);

if (!name || strcmp(name, "SUNW,JavaStation-1"))
if (!i8042_is_mr_coffee())
platform_driver_unregister(&sparc_i8042_driver);
}

Expand Down

0 comments on commit fe5b6aa

Please sign in to comment.