From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v2 3/7] media: uvcvideo: Allow external entities
Date: Wed, 4 Nov 2020 19:07:30 +0100 [thread overview]
Message-ID: <20201104180734.286789-4-ribalda@chromium.org> (raw)
In-Reply-To: <20201104180734.286789-1-ribalda@chromium.org>
Increase the size of the id, to avoid collisions with external entities.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_driver.c | 2 +-
drivers/media/usb/uvc/uvcvideo.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 77fea26faa9a..7a1b2decccc8 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1024,7 +1024,7 @@ static const u8 uvc_media_transport_input_guid[16] =
UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT;
static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING;
-static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id,
+static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id,
unsigned int num_pads, unsigned int extra_size)
{
struct uvc_entity *entity;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index df7bf2d104a3..00f985001c1d 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -301,7 +301,7 @@ struct uvc_entity {
* chain. */
unsigned int flags;
- u8 id;
+ u16 id; /* 0-255: usb entity. 256-65535: external entities */
u16 type;
char name[64];
u8 guid[16];
--
2.29.1.341.ge80a0c044ae-goog
next prev parent reply other threads:[~2020-11-04 18:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 18:07 [PATCH v2 0/7] Show privacy_gpio as a v4l2_ctrl Ricardo Ribalda
2020-11-04 18:07 ` [PATCH v2 1/7] media: uvcvideo: Use pr_cont() macro Ricardo Ribalda
2020-11-04 19:29 ` Joe Perches
2020-11-04 21:42 ` Laurent Pinchart
2020-11-04 21:51 ` Joe Perches
2020-11-04 22:31 ` Ricardo Ribalda
2020-11-04 23:00 ` Joe Perches
2020-11-04 23:01 ` Ricardo Ribalda
2020-11-04 23:59 ` Joe Perches
2020-11-05 9:50 ` Ricardo Ribalda
2020-11-05 18:58 ` Joe Perches
2020-11-05 19:52 ` Ricardo Ribalda
2020-11-04 21:42 ` Ricardo Ribalda
2020-11-04 18:07 ` [PATCH v2 2/7] media: uvcvideo: Move guid to entity Ricardo Ribalda
2020-11-06 6:06 ` Laurent Pinchart
2020-11-06 8:45 ` Ricardo Ribalda
2020-11-04 18:07 ` Ricardo Ribalda [this message]
2020-11-04 18:07 ` [PATCH v2 4/7] media: uvcvideo: Allow entities with no pads Ricardo Ribalda
2020-11-04 18:07 ` [PATCH v2 5/7] media: uvcvideo: Entity defined get_info and get_cur Ricardo Ribalda
2020-11-04 18:07 ` [PATCH v2 6/7] media: uvcvideo: Implement UVC_EXT_GPIO_UNIT Ricardo Ribalda
2020-11-04 18:07 ` [PATCH v2 7/7] media: uvcvideo: Add Privacy control based on EXT_GPIO Ricardo Ribalda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201104180734.286789-4-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®