Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / drivers / input / touchscreen / penmount.c

diff --git a/drivers/input/touchscreen/penmount.c b/drivers/input/touchscreen/penmount.c
index 7fc556295c0e1e75e98090c6a05ac10c3ee212b2..4c012fb2b01eb091f764abea0ef992e8052a53d3 100644 (file)
--- a/drivers/input/touchscreen/penmount.c
+++ b/drivers/input/touchscreen/penmount.c
@@ -183,12 +183,12 @@ static void pm_disconnect(struct serio *serio)
 {
        struct pm *pm = serio_get_drvdata(serio);
 
-       input_get_device(pm->dev);
-       input_unregister_device(pm->dev);
        serio_close(serio);
-       serio_set_drvdata(serio, NULL);
-       input_put_device(pm->dev);
+
+       input_unregister_device(pm->dev);
        kfree(pm);
+
+       serio_set_drvdata(serio, NULL);
 }
 
 /*