diff options
author | Ingo Molnar | 2011-10-04 11:08:16 +0200 |
---|---|---|
committer | Ingo Molnar | 2011-10-04 11:09:08 +0200 |
commit | 22f92bacbeea24b20e447444c28e7cad9f1ac3f8 (patch) | |
tree | 5c3f2346804a186aa2d954f078fd2f4d44bcc26e /drivers/media/video/v4l2-device.c | |
parent | sched, tracing: Show PREEMPT_ACTIVE state in trace_sched_switch (diff) | |
parent | Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux (diff) | |
download | kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.gz kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.xz kernel-qcow2-linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.zip |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/v4l2-device.c')
-rw-r--r-- | drivers/media/video/v4l2-device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c index c72856c41434..e6a2c3b302d4 100644 --- a/drivers/media/video/v4l2-device.c +++ b/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); |