From 45644f95a6ec9a38e057181b0d9cb424b041f757 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Thu, 17 Jan 2008 12:01:51 -0500 Subject: [PATCH] --- yaml --- r: 75544 b: refs/heads/master c: 653e91d01fa4d39d2ed06a8c2096fef08b00ee7e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/lifebook.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 69e8fb38ba14..a262d52beb16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 746b31a9d4e08240d267069bcf5084eb7e427ad7 +refs/heads/master: 653e91d01fa4d39d2ed06a8c2096fef08b00ee7e diff --git a/trunk/drivers/input/mouse/lifebook.c b/trunk/drivers/input/mouse/lifebook.c index 9ec57d80186e..df81b0aaa9f8 100644 --- a/trunk/drivers/input/mouse/lifebook.c +++ b/trunk/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; }