From nobody Fri Jul 24 18:19:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4h6GV72w0Nz6mWs6 for ; Fri, 24 Jul 2026 18:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6GV725fQz49jv for ; Fri, 24 Jul 2026 18:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784917167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y1b0WOhjELN+irO761GaGo8+ItX82+ZAmd2CGD23mGk=; b=IHKIUA7wYRLUz2VAmKHGo+ECb/FBUr3fH6JFrIUGt3zmicOvcV7Hnv+BfaMmmvIlB3G2RT UXqX1ZeDHMXR0nMkByx3zhm7531o3BpBflwYBIA2edQIAoFcoEkfPOUNuK/H3yd+b5ZNHE EfaomxlbQ/UAat0y8jwMcbvGiCY/W1gey+r3ggazOkfr8+do/t2e70ZLe0kAloO+YktoLy s1yMBH0d153D6JhtTTaNuBPuS9u3aWth5lT+VUP9pzds1ZawCsxJQjMav6SC9FDGRpVYR4 lzewDVOFQIU+OfSyCaW5U0esdxqh+Te4YQUEshAH9MqfKztCBPe7ZRMIIUzcog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784917167; a=rsa-sha256; cv=none; b=Q6GP7Zuf0/NPYBy6Mjy8UwPxe7FTPA82mBlhAztRkW7mEBaJgii7BQchyOblWRgUQ4UsJI vLrZXyvPWhC+EaAsIhzpfpeJxDqbFUn2jeMwHNWHzjYdSvq+P1MSUNmqNoD1pJSi2ZQkpw ZKHrgG9yynM9GwcPUce/CjM0pvdt44OHGrRnhe46qU2SQjJBiwKG5ONq1+D7M2rfXcdC1r ZggY7JxJ7HNDnMTH7NJDxFHwdPS40sgZuQHzATLm5T6EOVnB41dmMnAknH1urKxsDInCWL 4qjStddQ+BIHfJsglje+J1RQv0zRgeJLOocotIRUjms5U2nP+kGH8VJ2Zw8srQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784917167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y1b0WOhjELN+irO761GaGo8+ItX82+ZAmd2CGD23mGk=; b=eCPLNtsc8sCjwT25E9J8mSI98q5gSm8qsnww69lPGv+90UuOp2poF+4Z6dl1bkSmrs6ShL 3+yhQeU5LbjH9kzRlIS3+kA5gdv/jIDffoE25+9rHkYox7wTdNBnxpcgj3HYenO5LX/SdI kVhcLkAb3WcacufL2VfN2/zjIY2yg2hEuB6VCL8G9e1QXFf9xAMyeD8GKJapdllGLRSaBZ WUnBE0w9hg2TAvq/yP3Ff8YDtof1hq81amt2z2KhMVUY10mJVKy2bxbl+/NfkMHGEVMdjq FZa86uTzwHgGp5vnFYELCkoA3HLPd+g0VkLwJANUYCmzO5urrs+mN7otwzTuOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6GV710Sfz12k2 for ; Fri, 24 Jul 2026 18:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c364 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 18:19:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8a7ab3ed22d9 - main - uvideo: Return actual mtx_sleep error in dqbuf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a7ab3ed22d9d6b49c5c4799c1468017d691b343 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 18:19:22 +0000 Message-Id: <6a63acaa.1c364.4ab0b2c0@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8a7ab3ed22d9d6b49c5c4799c1468017d691b343 commit 8a7ab3ed22d9d6b49c5c4799c1468017d691b343 Author: Ed Maste AuthorDate: 2026-07-21 18:01:53 +0000 Commit: Ed Maste CommitDate: 2026-07-24 17:34:12 +0000 uvideo: Return actual mtx_sleep error in dqbuf Don't coerce errors to EINVAL, which isn't correct for mtx_sleep's failure cases. Sponsored by: The FreeBSD Foundation --- sys/dev/usb/video/uvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/video/uvideo.c b/sys/dev/usb/video/uvideo.c index bb52232e153e..6bed4b4acee3 100644 --- a/sys/dev/usb/video/uvideo.c +++ b/sys/dev/usb/video/uvideo.c @@ -3793,7 +3793,7 @@ uvideo_dqbuf(struct uvideo_softc *sc, struct v4l2_buffer *dqb) error = mtx_sleep(sc, &sc->sc_mtx, PCATCH, "uvdqbuf", hz * 10); if (error != 0) { mtx_unlock(&sc->sc_mtx); - return (EINVAL); + return (error); } if (sc->sc_dying) { mtx_unlock(&sc->sc_mtx);