From cd6c0856e6bb270370a5484c65ca6f69b43d9d23 Mon Sep 17 00:00:00 2001 From: Dave Young Date: Tue, 6 Sep 2011 09:08:08 -0300 Subject: [PATCH] --- yaml --- r: 264197 b: refs/heads/master c: 236c5441d70312242b5b32d229259930046a80e5 h: refs/heads/master i: 264195: a7b75bf31a061607d50e62fe4ddd055ff5e9fbcf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-device.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e7c7f6d6e470..8b1234fe69db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8280b662df96f4172c4972b14a4aec0daf272b8f +refs/heads/master: 236c5441d70312242b5b32d229259930046a80e5 diff --git a/trunk/drivers/media/video/v4l2-device.c b/trunk/drivers/media/video/v4l2-device.c index c72856c41434..e6a2c3b302d4 100644 --- a/trunk/drivers/media/video/v4l2-device.c +++ b/trunk/drivers/media/video/v4l2-device.c @@ -38,6 +38,7 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev) mutex_init(&v4l2_dev->ioctl_lock); v4l2_prio_init(&v4l2_dev->prio); kref_init(&v4l2_dev->ref); + get_device(dev); v4l2_dev->dev = dev; if (dev == NULL) { /* If dev == NULL, then name must be filled in by the caller */ @@ -93,6 +94,7 @@ void v4l2_device_disconnect(struct v4l2_device *v4l2_dev) if (dev_get_drvdata(v4l2_dev->dev) == v4l2_dev) dev_set_drvdata(v4l2_dev->dev, NULL); + put_device(v4l2_dev->dev); v4l2_dev->dev = NULL; } EXPORT_SYMBOL_GPL(v4l2_device_disconnect);