diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 06:22:53 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 06:22:53 +0200 |
| commit | a7097ff89c3204737a07eecbc83f9ae6002cc534 (patch) | |
| tree | 11fe55cbfb3651fc57e59fc838d1e084f5e63749 /drivers/input/mousedev.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for... (diff) | |
| download | linux-a7097ff89c3204737a07eecbc83f9ae6002cc534.tar.xz linux-a7097ff89c3204737a07eecbc83f9ae6002cc534.zip | |
Input: make sure input interfaces pin parent input devices
Recent driver core change causes references to parent devices being
dropped early, at device_del() time, as opposed to when all children
are freed. This causes oops in evdev with grabbed devices. Take the
reference to the parent input device ourselves to ensure that it
stays around long enough.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/mousedev.c')
| -rw-r--r-- | drivers/input/mousedev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index bbbe5e81adc1..b989748598ae 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -414,6 +414,7 @@ static void mousedev_free(struct device *dev) { struct mousedev *mousedev = container_of(dev, struct mousedev, dev); + input_put_device(mousedev->handle.dev); kfree(mousedev); } @@ -865,7 +866,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, mousedev->minor = minor; mousedev->exist = 1; - mousedev->handle.dev = dev; + mousedev->handle.dev = input_get_device(dev); mousedev->handle.name = mousedev->name; mousedev->handle.handler = handler; mousedev->handle.private = mousedev; |