From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEB66376; Wed, 5 Feb 2025 15:03:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767791; cv=none; b=sik5ssqtNw+PJa7wYY1FdMV+I4ihFShD+FCgWMhHJL3VnPOM0Em/C69yUQgxEbu+y8ObygD4IGY1e0YqEM6fpsjtX4lyUkvVEKcBYN2l2hNP15NrsrQAbdSZMJHoZhNm4xhsIVAZoVNSLdP7uGjsobzHinAFOMNFKGa06HYTQsU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767791; c=relaxed/simple; bh=/fwqXBvoU/d5kDh5KrUpOFqIJMB1xsYX0zYTXbKzLdw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eHxl8uA19fvQ5IZrnslFzVE1y9ifDxNx7pX14tIizarRPJn3KRFvXNtH9xMv1iFFfUTkGyZfbDDjB/FxahAwWloNW/jU3mWrkQGQhnzHU0Ac2/WfGpYZbNXqvKBshPo17YJwuyoLY/n4aBhpSjjcjQuvDghnve1S8mDR6Jexga8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cElzK5l4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cElzK5l4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22E85C4CED1; Wed, 5 Feb 2025 15:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738767791; bh=/fwqXBvoU/d5kDh5KrUpOFqIJMB1xsYX0zYTXbKzLdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cElzK5l4K3pumqOEyZXFoqeehjNjZhKpeuKF4yF+PFHRlSAXM2qQQyAel2MhwRxSw A/83YdQPsZEnaX83003xg3pN8DfxiF2C8l7W1h2LiRIfu5zNr7NIWUmQFY+fqwV2l0 WSJku+BxTmgr2mRyCoVkEjbqN9eIi52osKHOrYB0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hans de Goede , Ricardo Ribalda , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 6.13 454/623] media: uvcvideo: Propagate buf->error to userspace Date: Wed, 5 Feb 2025 14:43:16 +0100 Message-ID: <20250205134513.583746760@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134456.221272033@linuxfoundation.org> References: <20250205134456.221272033@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ricardo Ribalda [ Upstream commit 87ce177654e388451850905a1d376658aebe8699 ] Now we return VB2_BUF_STATE_DONE for valid and invalid frames. Propagate the correct value, so the user can know if the frame is valid or not via struct v4l2_buffer->flags. Reported-by: Hans de Goede Closes: https://lore.kernel.org/linux-media/84b0f212-cd88-46bb-8e6f-b94ec3eccba6@redhat.com Fixes: 6998b6fb4b1c ("[media] uvcvideo: Use videobuf2-vmalloc") Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart Reviewed-by: Hans de Goede Link: https://lore.kernel.org/r/20241218-uvc-deprecate-v2-1-ab814139e983@chromium.org Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/uvc/uvc_queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index 26ee85657fc89..f8464f0aae1b8 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -479,7 +479,8 @@ static void uvc_queue_buffer_complete(struct kref *ref) buf->state = buf->error ? UVC_BUF_STATE_ERROR : UVC_BUF_STATE_DONE; vb2_set_plane_payload(&buf->buf.vb2_buf, 0, buf->bytesused); - vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE); + vb2_buffer_done(&buf->buf.vb2_buf, buf->error ? VB2_BUF_STATE_ERROR : + VB2_BUF_STATE_DONE); } /* -- 2.39.5