From nobody Fri Jul 24 18:19:22 2026 X-Original-To: dev-commits-src-main@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 4h6GV22zhQz6mWWS for ; Fri, 24 Jul 2026 18:19:22 +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 4h6GV22Kwwz49ZF for ; Fri, 24 Jul 2026 18:19:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784917162; 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=jZ8lL5BB9RUSTYrrYYFPUAXEJiMNZuRyb50I9TZU4G6+uQSaAEeA2m75CkFJsvq2S0vX/y Cq5qy05ntbvk9xbB9tFkaVOaogH+2vYe82F3EOcWcxeoLw93Moo1OjAWCR+T34hUcPkq0r Q6K3ELX4gXHbHijrLHLqjP8Mu9CmbDFT0hXimVoS6lDWXwU0a3+XqV0BpsS4lVhTG3lHRS oG43jho/SySC8RsEIbTIvabeku6tyTL59P6QE1AFPz1YmcdNzgsS56cSlVnlSM0oLLfiRK qIERJrg0ofl6k9IFSOQ2PNdcIIw1bMetVP6mqO6t6SpzzBUh4vCuT4/4pARhoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784917162; a=rsa-sha256; cv=none; b=L5M/zVFzHG5aG9g8q29C31yDO1wXDNKc682O7+Bz+r5YId3Zpru9M+A4JIjeWns9pkwdT1 VEw1sJohYqhlz4uQxSYNDZifbc1LHPrR9kLKOqwgkWGf9/5dr7x0MbzNPNTyRw9d40tH2W b8gWzAWXIj7uaIBx58phCMURDbj6QdvmffmEjawbCFlDD55XA2KxuXux5PJYc/J4A/xgqn oe2K/mTT5U5m8WMqmPPtTXaFMRzq5a6obiIDBRBrPpSdoJDJDCCm6AMIcHPt+jbIFEXXgi yaEf+Ee7aY61DfA3cCCEvL1EdWchV+ZegAAekPPtub739YcM3n59AjYTR4FDrA== 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=1784917162; 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=yGXSGbs6z5ys66kxGFH0bgzxds84/kP01DLWxJoBasA44uc/3NYibnZwIDlyYqboYf92ge MmHy6MnMmwzIBUbXNefeqyGLg7qtvDVhAjEq6lkaXmUh4LybPN0DSs6YpTr+k/nB3GkOR9 ycNmDvbusdENeeRGpXejRMUlOrUqN1zgaiJr56o0p+BdBk4itxyVaylXO7e/wlkd04ZGoC p8Jnm5n+RdiaypJ3fASUCtmz4JwMdq04KdfzSwLGcIFl09SreQQT9LQu3i60AHBuOu7V+k PmS7alGe2dmKLutSLAosq+oWFYElqp5wBQqjkLpkphNzzBXtjIetj8+OofEwPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6GV20lsnz12xR for ; Fri, 24 Jul 2026 18:19:22 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);