summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-09-06 19:16:18 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-21 22:18:07 -0300
commit4d9b2ebd335d83044b9e6656d0e604e8e1300334 (patch)
tree31f61931a560ee5c5892ec2bdc4192b175cb60a5 /drivers/media
parent236c5441d70312242b5b32d229259930046a80e5 (diff)
downloadop-kernel-dev-4d9b2ebd335d83044b9e6656d0e604e8e1300334.zip
op-kernel-dev-4d9b2ebd335d83044b9e6656d0e604e8e1300334.tar.gz
[media] uvcvideo: Fix crash when linking entities
The uvc_mc_register_entity() function wrongfully selects the media_entity associated with a UVC entity when creating links. This results in access to uninitialized media_entity structures and can hit a BUG_ON statement in media_entity_create_link(). Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/uvc/uvc_entity.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/video/uvc/uvc_entity.c
index 48fea37..29e2399 100644
--- a/drivers/media/video/uvc/uvc_entity.c
+++ b/drivers/media/video/uvc/uvc_entity.c
@@ -49,7 +49,7 @@ static int uvc_mc_register_entity(struct uvc_video_chain *chain,
if (remote == NULL)
return -EINVAL;
- source = (UVC_ENTITY_TYPE(remote) != UVC_TT_STREAMING)
+ source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING)
? (remote->vdev ? &remote->vdev->entity : NULL)
: &remote->subdev.entity;
if (source == NULL)
OpenPOWER on IntegriCloud