From: Hans Verkuil Date: Fri, 19 Dec 2008 12:10:56 +0000 (-0300) Subject: V4L/DVB (9942): v4l2-dev: check for parent device in get_index. X-Git-Tag: v2.6.29-rc1~556^2~151 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=806e5b7cfa96195baadc4cc4663266aaac92e22b;p=linux-2.6-omap-h63xx.git V4L/DVB (9942): v4l2-dev: check for parent device in get_index. get_index requires a valid parent device in order to discover which indices are in use. Some drivers (e.g. pvrusb2) do not set the parent device. In that case just return 0. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 682f48aadca..c5ca51a9020 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/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 &&