From patchwork Tue Dec 3 21:20:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13892985 Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) (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 4CFB720ADEB for ; Tue, 3 Dec 2024 21:20:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260823; cv=none; b=Pzknf+R5ffl2lHkWllJrxdqvbA4BxnSSRSte4Kv0tb4tO8jr1G6vjQSDWiLD0ioTlYpenxcdtpn39N4vNhirBLSeOhaXXI90qU6mJ1rV84njsO1r8+Ma+l/SD0Uf9jvG7QcQ3/IkmBKXQCXgmaGw/hhHMQ+D3dY5PbX3uQ7eT2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733260823; c=relaxed/simple; bh=l4/lhwctK3kBC3s2JyaOOWF9ukBbTcldFztSXBtwWD8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cGzvyVOqSnxQAv11AXz+/4iFf+JR1Rm9H2SqVrnl3c2eKAuVqasR5E6n/qBqhQlve5uwN1ZdH3prP5WsSqzsaAtX4TKyBdNNtEUa49T3e05iiHAWsZtZNH5eaLbvNPjmNunWIaerQXfReTeaI9xxtpI0eOTrit0v1IEVJjv98hI= 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=e+E6Nm1h; arc=none smtp.client-ip=209.85.222.53 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="e+E6Nm1h" Received: by mail-ua1-f53.google.com with SMTP id a1e0cc1a2514c-85b92397fe2so818894241.3 for ; Tue, 03 Dec 2024 13:20:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1733260821; x=1733865621; 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=nL4Atu/0WT3Bi8AnR4uXCq5U/XlhAxlSF0B4ijqZik8=; b=e+E6Nm1hFjwqcRGOb8qFT7tP30MVCZ5B+SM3iPDu9n3QNPvXzjxd1FrRbPpgbWkJ2+ UQRcB7vnhSiW8iDNOGfhOXGnvMlywv8romtCbY4/Sxd7jBX8CozCRYEuXKIjGLuPIjg+ T91RF4uUsqLpE+A9X3QSjA8e/9zqooMdpCNlE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733260821; x=1733865621; 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=nL4Atu/0WT3Bi8AnR4uXCq5U/XlhAxlSF0B4ijqZik8=; b=N6PzKspLqRdo2cYLAPVFASi2IEcMOqCaCloa38oStf8DIVUxzg7cBOWD9qNtBkC+nr Cc+NZuleWuCLQTq4eCpj+S6kb+2yzt1Bo5kdgWZsi/Gg6yyElGn9AIsUokHOvzM/cQuF N7+zoXKX5gDByOShZSUmdOukdwoYDVhqWCdxC7g36nZbT0vwkTdx1vqdhxk0+/FrVf8H 04/88GvFs7sBqc4OJdCe268/7W7PodWklUfdHk0CIGRvZlgim5Cakax+MZKd4nzch5Dv OtTV0f2CeOVLj1kAdm4UaHPwjw+XGv5uTLEZZYEMDbbwE+Cqkwur7d0xGedPWm1GOVUZ vxnw== X-Forwarded-Encrypted: i=1; AJvYcCUa56OfitYNdAtJAUNQwmgehjPu/7sI3NXZ7SjDfnMQij34e6V+4mweBzOfZ4lU2VUL0UOU2D0n/9Lx7g==@vger.kernel.org X-Gm-Message-State: AOJu0YzZgoKIXwt/py5rNTKF4/mSh6++FWgerSnHADbyideHcGEAYKAh 4s/vAJ8Ttpl8L43sdnUvgf2NPt0EOxYxogO+A3X4fYRKukG0WrNniODU4BmriQ== X-Gm-Gg: ASbGncuLyEAtRJ7YY94zbj2TQ5rHPo7IuagBgucVliNMWNErZIVp9IZldCbpBzYZEhw 5Mp18KiiUjnjkg3Z6wZf0vFgg277+pUYZuEpN3e0EMGbIw5+sMpY5tVrCAyaUVVzyapUDHChd3i YU0NowvR2oRkfILcF3o+cPL+IM3ad6ADp1WBVcqdy3llaa9dCCB/dj/u36J15dc3C2IfTs+HF8u /28EM/SnIWAQ5rTkiBVTWg35bH9PNtI59ikUZFqz/+lJo3CjvDNVbW+UFkzN4rhHT9hC87jms3h d4nae2XmsA03i0pkq698FF8Q X-Google-Smtp-Source: AGHT+IFDq/YyaSDjFBUXsfLRGsjk8UOE+Mft2rZWydxkoxjhSW9PDslAnWq3gxZr/nwtXjYBEcitrw== X-Received: by 2002:a05:6102:e0f:b0:4af:4c4d:c8e8 with SMTP id ada2fe7eead31-4afa4fb9017mr3596621137.7.1733260821288; Tue, 03 Dec 2024 13:20:21 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-85b82a89d5csm2140364241.8.2024.12.03.13.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2024 13:20:20 -0800 (PST) From: Ricardo Ribalda Date: Tue, 03 Dec 2024 21:20:09 +0000 Subject: [PATCH v6 2/5] media: uvcvideo: Remove redundant NULL assignment Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241203-uvc-fix-async-v6-2-26c867231118@chromium.org> References: <20241203-uvc-fix-async-v6-0-26c867231118@chromium.org> In-Reply-To: <20241203-uvc-fix-async-v6-0-26c867231118@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org X-Mailer: b4 0.13.0 ctrl->handle will only be different than NULL for controls that have mappings. This is because that assignment is only done inside uvc_ctrl_set() for mapped controls. Cc: stable@vger.kernel.org Fixes: e5225c820c05 ("media: uvcvideo: Send a control event when a Control Change interrupt arrives") Reviewed-by: Laurent Pinchart Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_ctrl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 9a80a7d8e73a..42b0a0cdc51c 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1640,10 +1640,8 @@ bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain, struct uvc_device *dev = chain->dev; struct uvc_ctrl_work *w = &dev->async_ctrl; - if (list_empty(&ctrl->info.mappings)) { - ctrl->handle = NULL; + if (list_empty(&ctrl->info.mappings)) return false; - } w->data = data; w->urb = urb;