From 3cf862f175454b5b5437b7da61aab3f16b28bf88 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 19 Dec 2008 09:10:56 -0300 Subject: [PATCH] --- yaml --- r: 124439 b: refs/heads/master c: 806e5b7cfa96195baadc4cc4663266aaac92e22b h: refs/heads/master i: 124437: 3bead816ef43d04dcb332f5a652f29cfabc10a4d 124435: a5ffb18a85b33ee26d6b09fdcf7cb24c42c79531 124431: f5ab647e80587ae96b3661d3fa32c6fc037262af v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-dev.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 30d1bfe6d231..dcb6bec98be9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfbd3072890e119639b97a133d84c13d25bba034 +refs/heads/master: 806e5b7cfa96195baadc4cc4663266aaac92e22b diff --git a/trunk/drivers/media/video/v4l2-dev.c b/trunk/drivers/media/video/v4l2-dev.c index 682f48aadcac..c5ca51a9020a 100644 --- a/trunk/drivers/media/video/v4l2-dev.c +++ b/trunk/drivers/media/video/v4l2-dev.c @@ -162,6 +162,10 @@ static int get_index(struct video_device *vdev, int num) return -EINVAL; } + /* Some drivers do not set the parent. In that case always return 0. */ + if (vdev->parent == NULL) + return 0; + for (i = 0; i < VIDEO_NUM_DEVICES; i++) { if (video_device[i] != NULL && video_device[i] != vdev &&