From d8395ebe96956b8101d659c1260fa603ba6288bf Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Thu, 17 Jan 2008 12:01:30 -0500 Subject: [PATCH] --- yaml --- r: 75543 b: refs/heads/master c: 746b31a9d4e08240d267069bcf5084eb7e427ad7 h: refs/heads/master i: 75541: 49f4fa901ebc76d6e3e2557e0acc78efb7b24492 75539: f3536a7bdf439c7004e28aa9f611b3d507d537f5 75535: 74d44091557b5b7b1998b63bcf9d4fcecad1495b v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/psmouse-base.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a35176df40a5..69e8fb38ba14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62aa366d9b0158a81eace3b83e6b027789f7575b +refs/heads/master: 746b31a9d4e08240d267069bcf5084eb7e427ad7 diff --git a/trunk/drivers/input/mouse/psmouse-base.c b/trunk/drivers/input/mouse/psmouse-base.c index 21a9c0b69a1f..b8628252e10c 100644 --- a/trunk/drivers/input/mouse/psmouse-base.c +++ b/trunk/drivers/input/mouse/psmouse-base.c @@ -1247,6 +1247,8 @@ static int psmouse_connect(struct serio *serio, struct serio_driver *drv) err_pt_deactivate: if (parent && parent->pt_deactivate) parent->pt_deactivate(parent); + input_unregister_device(psmouse->dev); + input_dev = NULL; /* so we don't try to free it below */ err_protocol_disconnect: if (psmouse->disconnect) psmouse->disconnect(psmouse);