From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A17A7C55179 for ; Wed, 4 Nov 2020 18:07:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 49A97206FA for ; Wed, 4 Nov 2020 18:07:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ACgVABxV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732267AbgKDSH5 (ORCPT ); Wed, 4 Nov 2020 13:07:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731657AbgKDSHu (ORCPT ); Wed, 4 Nov 2020 13:07:50 -0500 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC7CCC061A4C for ; Wed, 4 Nov 2020 10:07:49 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id b8so23090402wrn.0 for ; Wed, 04 Nov 2020 10:07:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d3yal1NPjyXYa+Lww+W7he31FAQCpjt9AFpTy83XXP4=; b=ACgVABxVnSQoCwu/ik/Mj1Ugn0BE388tkndbp6DYWRoaN+I2DhX72YaXkq76rUxAYN OMF2vNJX67B+O8JZ0EaYk7Qhyml/0drDeaL3g4Njnmta6C6cPkVFiR3jTm4Ns6yJ2L5C oA+upDgPWipTUA4HfLrdY7JeG753mRtFUoPYQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d3yal1NPjyXYa+Lww+W7he31FAQCpjt9AFpTy83XXP4=; b=FUCSL9yCHjX6tUhq2ulIbAWuZEC5wCns4UjU2ghWDMCq6CjfM7DBdUGv0vgkrGsKGb 2a6pkGB76QF1VXRQwaUcilmE8nXlyq6tZsEsbiZw89hf324uxbguCRwjhRViQrc6a3VQ 8ywH/MJGisr5I4NjwPep4ipNPfHhsK4WmnR+6weJPSO9Yu506eR9jDIriNkKk1/sumUt Z+HImupK5e3e8+MhWzE4tRMXxrftddHcb0JGgsH3kSD1Yyk4E5ghUuN7Cx2BrepJGjN5 2xgcgqfCZRMW4Lr4OoOT3/RZ0GxspVYzM+HSnp5lK067P+Lez+p/BgZgsI5vl77WgLIA 42LQ== X-Gm-Message-State: AOAM532FCSnLB3NQ7hVU9K5jt8xE65PDHxdD9m9x/Rk8j8vGG2MWN/fZ 1lUejD2okAy77Jzt0uNYmUOVBA== X-Google-Smtp-Source: ABdhPJwPT8KhxLmALamllLMYJJmBdpDMzjsFUeGmAeQ7Fqt++EYBbuSBNXrWY+Opc7oiAfqQuu3AjQ== X-Received: by 2002:adf:e4ca:: with SMTP id v10mr35571120wrm.53.1604513268606; Wed, 04 Nov 2020 10:07:48 -0800 (PST) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id y10sm3801841wru.94.2020.11.04.10.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 10:07:48 -0800 (PST) From: Ricardo Ribalda To: Laurent Pinchart , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Subject: [PATCH v2 3/7] media: uvcvideo: Allow external entities Date: Wed, 4 Nov 2020 19:07:30 +0100 Message-Id: <20201104180734.286789-4-ribalda@chromium.org> X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog In-Reply-To: <20201104180734.286789-1-ribalda@chromium.org> References: <20201104180734.286789-1-ribalda@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Increase the size of the id, to avoid collisions with external entities. Signed-off-by: Ricardo Ribalda --- 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