diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 20:17:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 20:17:47 -0300 |
| commit | 675d7080a5676f235b39a78a0af9d6a32b589133 (patch) | |
| tree | fff786e9e33cd9c182e22f8bb8c67a92fb3ad63e /linux/drivers/media/video/v4l2-dev.c | |
| parent | 3e0273a7209d6a20bd422beec8b46dd6b79a00a7 (diff) | |
| parent | eb97af7a1c842f6958f57fe8f9dbd93471d17948 (diff) | |
| download | mediapointer-dvb-s2-675d7080a5676f235b39a78a0af9d6a32b589133.tar.gz mediapointer-dvb-s2-675d7080a5676f235b39a78a0af9d6a32b589133.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/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. */ |