From 6e1f7b6ba09e8dbe12ba4a4131247d0150664a22 Mon Sep 17 00:00:00 2001 From: Yang Ruirui Date: Tue, 6 Sep 2011 08:08:08 -0300 Subject: [PATCH] --- yaml --- r: 271867 b: refs/heads/master c: 69803ecf3a852a8dd0c76a3d2cfcc7aec1e750e2 h: refs/heads/master i: 271865: e198109ef2b94f94734d4c88bef5ffe866a85a25 271863: c512782e4aa0334f37637ae3ae0fce24f844507e 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 b751e4eeaca5..fa977ef7d775 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9da9f356dc73c2ae65a15a1c1d6e53142706e96b +refs/heads/master: 69803ecf3a852a8dd0c76a3d2cfcc7aec1e750e2 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);