Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=653e91d01fa4d39d2ed06a8c2096fef08b00ee7e
Commit:     653e91d01fa4d39d2ed06a8c2096fef08b00ee7e
Parent:     746b31a9d4e08240d267069bcf5084eb7e427ad7
Author:     Andres Salomon <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 17 12:01:51 2008 -0500
Committer:  Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Thu Jan 17 12:01:51 2008 -0500

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
---
 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 9ec57d8..df81b0a 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;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to