diff options
| author | Andres Salomon <dilinger@queued.net> | 2008-01-17 18:01:51 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-01-17 18:01:51 +0100 |
| commit | 653e91d01fa4d39d2ed06a8c2096fef08b00ee7e (patch) | |
| tree | 187406751d0a2a440a1735cc24b6e9e2b605c35f /drivers/input | |
| parent | Input: psmouse - fix potential memory leak in psmouse_connect() (diff) | |
| download | linux-653e91d01fa4d39d2ed06a8c2096fef08b00ee7e.tar.xz linux-653e91d01fa4d39d2ed06a8c2096fef08b00ee7e.zip | |
Input: psmouse - fix input_dev leak in lifebook driver
The lifebook driver may register a second input device, but it never
unregisters it. This fixes that.
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/lifebook.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c index 9ec57d80186e..df81b0aaa9f8 100644 --- a/drivers/input/mouse/lifebook.c +++ b/drivers/input/mouse/lifebook.c @@ -225,8 +225,13 @@ static void lifebook_set_resolution(struct psmouse *psmouse, unsigned int resolu static void lifebook_disconnect(struct psmouse *psmouse) { + struct lifebook_data *priv = psmouse->private; + psmouse_reset(psmouse); - kfree(psmouse->private); + if (priv) { + input_unregister_device(priv->dev2); + kfree(priv); + } psmouse->private = NULL; } |