X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Finput%2Fjoydev.c;h=65d7077a75a19202288d4bc4484c19ca9b93c5c2;hb=7a63ce5a1f2fde5ae737f059e2714e441447120c;hp=22b2789ef58ad17e30299f5fcbc7f5587d11dba9;hpb=f768f9d3757be475a20cb5f9d63bda45934150b1;p=linux-2.6

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 22b2789ef5..65d7077a75 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -171,6 +171,7 @@ static void joydev_free(struct device *dev)
 {
 	struct joydev *joydev = container_of(dev, struct joydev, dev);
 
+	input_put_device(joydev->handle.dev);
 	kfree(joydev);
 }
 
@@ -750,7 +751,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
 	joydev->minor = minor;
 
 	joydev->exist = 1;
-	joydev->handle.dev = dev;
+	joydev->handle.dev = input_get_device(dev);
 	joydev->handle.name = joydev->name;
 	joydev->handle.handler = handler;
 	joydev->handle.private = joydev;