diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 18:06:14 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 18:06:14 -0300 |
| commit | 9840199e825a71000f4d87e61380867fe3dc7f80 (patch) | |
| tree | aaee9b6e6b95130e5409343389d9f65dd9867094 /linux/drivers/media/video/v4l2-dev.c | |
| parent | f689c3bd615386cf4c5238d1b4de1aaf4b58ce69 (diff) | |
| parent | c3ce9d2f22c72aa484146a24d87be98d1a29ab9f (diff) | |
| download | mediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.gz mediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.bz2 | |
merge: http://linuxtv.org/hg/~hgoede/libv4l
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index 861e3194f..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. */ @@ -654,6 +654,7 @@ module_exit(videodev_exit) MODULE_AUTHOR("Alan Cox, Mauro Carvalho Chehab <mchehab@infradead.org>"); MODULE_DESCRIPTION("Device registrar for Video4Linux drivers v2"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CHARDEV_MAJOR(VIDEO_MAJOR); /* |