From nobody Wed Oct 8 10:37:48 2025 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE53D28C030 for ; Mon, 30 Jun 2025 14:20:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751293235; cv=none; b=L1GZSHDB8z4PogA4DbjL9fBo78c6b0DKrrG+4nWYhxQqWegbr3pGtdTj4sTz3AeAK6DxewNKly8DppLM9bwXx9hHajPV1WBKFbze8WbeU7n79+cNn2oPmSStOyY/3fwXdgap75OvclcoiGdpC0z4+Cm4VSROIj/v5W2SBzeSt1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751293235; c=relaxed/simple; bh=M4iJm9plTTflFPunOkSmnLashKdwUdy/6f2HU79tXu8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IYeoIzBJ2WW/fdT7d4H20nuxzr9Ov8+sCB5LluuLk+Z4/gj/8e1m54WPlDVlZWIvLiSpgjx9vG3HguAIgupTDHxkq878DO6jo6wzHrnRyzVAu0Q3qRVl4onUZcp5K/D9iNV/aH/WWPBaQx0HyzqeMY2zXB8xNpUhlM/Vprh5GtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=DABCQcdN; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="DABCQcdN" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-553b6a349ccso2417674e87.0 for ; Mon, 30 Jun 2025 07:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1751293232; x=1751898032; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=53U0DriXJKKU6AjmS/GbGBXA7AhDrFUGqACgSJAnLKQ=; b=DABCQcdNlfn/h2NxFRQwRnb257GneGPaYoZz8xaD+/G0W8DqL/PC3DBow43v/m/Ihk UWaEIw/TecrRtDFSHfcJzmAdoAus8N2ejM3dUZAAITi4BnZKzb3X6KdplduReNwp0XHY iNKg/EDkBnzwREAYUnbOClxsQ8mlIyPH/AcT0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751293232; x=1751898032; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=53U0DriXJKKU6AjmS/GbGBXA7AhDrFUGqACgSJAnLKQ=; b=bT287x0Ur91wRHj0ntT7VqEC9SZJrn7/f62/W1Njthmx8fYqLEs9hspvF8arafq4kL cu/ZI+7ZyoFjPtJNYBC0pT565guqlB4K2RxPKG28JHRCslDxOOEv1hHywU1O/7b2YQaI c8GAhokiJTVUZR1zhsMZ93uOJ0fpghivXEpzZ2/v9+FfHTy2EWBNHOqR2oP8tYoZ5NPY 15WEhgXWlQun+baBikCYllpwkRIRgOObN+hDpNmhEIOTe4RFGnQaNu7uXUz0I/233HD7 by3VQxNVMO8rapbZEMB8AfxVm+kZdE6cEqhaUz2GQgQBbOoWYomEvpZcR8+3zEMXWaur TGfg== X-Forwarded-Encrypted: i=1; AJvYcCVzQ0w7oP0tBO8EhAeOFOXNOkK1Un0/w9rMF6cmup0Kdfac3mZoPeEEoupGuCQc7kWE2D2Zei1O0uNK0go=@vger.kernel.org X-Gm-Message-State: AOJu0YwxZI4QIBLnY9zEXjtSMMafcMNFgWFJFlXnwyGIn3hVC00lq2dL 9+pjH1QJQoOO1O/phqLvhHgTe+O/NMs2jLyrW801+eozWsPJCIkE2zFos56LvoQV6omH32hac7s VfiwM0A== X-Gm-Gg: ASbGncsXg65+wYY8bXy2mBoJbqDIEBu5vN0jkGSNm8XzQoK0s75DU7jmDNUKbN+5IQt 2Ltzji2qJgeyw7YVvk4sTk4RNnGcUR0FAlTttoEzNQzs5hqDaD0jTEX6F+eR2ddrcPriOu1XXkp dwMzrGTDwSHIEEmGtqdNKdwjD6UberSbgKMpsvSGpDCFVrYXBQEkINOzGwdpuiKtGuftqUFz1nX 31kiTcSu8joky4REXnJQr+JRwbzVFOA7Cpzg4GvTL7rkEnB5mipFYoZAV4Om+gc0sMt3uUvJ40s 3S+7g/1IE2yh7UcDEG7CdS7ixB1w42XC7MqLShamXL0HzPcm+O/d0pLyM4fUh84ynzsRCrB4ZO6 F+IhbF5ccrFML4/5SEn44E9MisR9wYY5YirmXRHPOfA== X-Google-Smtp-Source: AGHT+IEyEk+IFI/NztfDlgnMuyWUGlQ1F/bRW1nlXrov83yP0tHVCKZPdgUeT/hlzVW+RcxmBJvWqQ== X-Received: by 2002:a05:6512:118a:b0:553:2dbd:6a61 with SMTP id 2adb3069b0e04-5550b80c2c7mr4349117e87.14.1751293231929; Mon, 30 Jun 2025 07:20:31 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5550b2d8ea8sm1432363e87.210.2025.06.30.07.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 07:20:31 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 30 Jun 2025 14:20:31 +0000 Subject: [PATCH v3 6/8] media: uvcvideo: Do not enable camera during UVCIOC_CTRL_MAP* Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250630-uvc-grannular-invert-v3-6-abd5cb5c45b7@chromium.org> References: <20250630-uvc-grannular-invert-v3-0-abd5cb5c45b7@chromium.org> In-Reply-To: <20250630-uvc-grannular-invert-v3-0-abd5cb5c45b7@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Hans Verkuil , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 The device does not need to be enabled to do this, it is merely an internal data operation. Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_v4l2.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index 7ab1bdcfb493fe9f47dbdc86da23cba98d7d10ff..350cd2cc88f872d2e8bd19e2b8f= b067894916364 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -1178,10 +1178,6 @@ static long uvc_v4l2_compat_ioctl32(struct file *fil= e, void __user *up =3D compat_ptr(arg); long ret; =20 - ret =3D uvc_pm_get(handle->stream->dev); - if (ret) - return ret; - switch (cmd) { case UVCIOC_CTRL_MAP32: ret =3D uvc_v4l2_get_xu_mapping(&karg.xmap, up); @@ -1197,9 +1193,15 @@ static long uvc_v4l2_compat_ioctl32(struct file *fil= e, =20 case UVCIOC_CTRL_QUERY32: ret =3D uvc_v4l2_get_xu_query(&karg.xqry, up); + if (ret) + break; + + ret =3D uvc_pm_get(handle->stream->dev); if (ret) break; ret =3D uvc_xu_ctrl_query(handle->chain, &karg.xqry); + uvc_pm_put(handle->stream->dev); + if (ret) break; ret =3D uvc_v4l2_put_xu_query(&karg.xqry, up); @@ -1212,8 +1214,6 @@ static long uvc_v4l2_compat_ioctl32(struct file *file, break; } =20 - uvc_pm_put(handle->stream->dev); - return ret; } #endif @@ -1226,6 +1226,7 @@ static long uvc_v4l2_unlocked_ioctl(struct file *file, =20 /* The following IOCTLs do not need to turn on the camera. */ switch (cmd) { + case UVCIOC_CTRL_MAP: case VIDIOC_CREATE_BUFS: case VIDIOC_DQBUF: case VIDIOC_ENUM_FMT: --=20 2.50.0.727.gbf7dc18ff4-goog