Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8be8ec6e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] uvcvideo: Mark first output terminal as default video node 



The MEDIA_ENT_FL_DEFAULT identifies entities that are considered as
default for their group and type. For video nodes, it identifies the
node that application should use by default.
UVC devices don't report which output terminal should be considered as
the default, use the first one. Most devices have a single output
terminal anyway.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0550513c

drivers/media/usb/uvc/uvc_driver.c

+2 −0
Original line number Diff line number Diff line
@@ -1564,6 +1564,8 @@ static int uvc_scan_device(struct uvc_device *dev) 
		chain->dev = dev;

		v4l2_prio_init(&chain->prio);



		term->flags |= UVC_ENTITY_FLAG_DEFAULT;



		if (uvc_scan_chain(chain, term) < 0) {

			kfree(chain);

			continue;

drivers/media/usb/uvc/uvc_entity.c

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ static int uvc_mc_init_entity(struct uvc_entity *entity) 
	} else if (entity->vdev != NULL) {

		ret = media_entity_init(&entity->vdev->entity,

					entity->num_pads, entity->pads, 0);

		if (entity->flags & UVC_ENTITY_FLAG_DEFAULT)

			entity->vdev->entity.flags |= MEDIA_ENT_FL_DEFAULT;

	} else

		ret = 0;

drivers/media/usb/uvc/uvcvideo.h

+4 −0
Original line number Diff line number Diff line
@@ -225,10 +225,14 @@ struct uvc_format_desc { 
 * always be accessed with the UVC_ENTITY_* macros and never directly.

 */



#define UVC_ENTITY_FLAG_DEFAULT		(1 << 0)



struct uvc_entity {

	struct list_head list;		/* Entity as part of a UVC device. */

	struct list_head chain;		/* Entity as part of a video device

					 * chain. */

	unsigned int flags;



	__u8 id;

	__u16 type;

	char name[64];