diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 18:17:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 18:17:30 -0300 |
| commit | bd5114e836d5c39563589881b3d9da0cf06624f1 (patch) | |
| tree | e5992f2b624f9178321dddba59e394af5e4da7cc /linux/drivers/media/video/v4l2-dev.c | |
| parent | 043985e41c1b3527cb1574753b3fd71c707a3d39 (diff) | |
| parent | 9840199e825a71000f4d87e61380867fe3dc7f80 (diff) | |
| download | mediapointer-dvb-s2-bd5114e836d5c39563589881b3d9da0cf06624f1.tar.gz mediapointer-dvb-s2-bd5114e836d5c39563589881b3d9da0cf06624f1.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-dev.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index 110cde853..5e9b46c21 100644 --- a/linux/drivers/media/video/v4l2-dev.c +++ b/linux/drivers/media/video/v4l2-dev.c @@ -433,7 +433,7 @@ int video_register_device_index(struct video_device *vdev, int type, int nr, vdev->vfl_type = type; vdev->cdev = NULL; - if (vdev->v4l2_dev) + if (vdev->v4l2_dev && vdev->v4l2_dev->dev) vdev->parent = vdev->v4l2_dev->dev; /* Part 2: find a free minor, kernel number and device index. */ |