From nobody Sun Oct 18 08:13:29 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 4j6rzF70mmz6jxnD for ; Sun, 18 Oct 2026 08:13:29 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j6rzF439Hz3KyZ for ; Sun, 18 Oct 2026 08:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792311209; 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=SNeBCw4A3LPwHk4dxJ69yyQeVsxxSgTcGp04NGGx0o0=; b=CVwydjEmV7yn5uGbyZnusIR7DBQhDSKYM84bjzNWyZBKYgnl8ZIm+d3MvFQeonjIHQ7xwa pTKWZat9csWLBgW7Vl35/eRgyQw/bMxb1a21x5VEJ1hh0B7Cx5XWZlxJ7a9rKlditklEk+ 5SnmZIu5U51dStiO3MDhq+fSc/gabAXn57IS+VLL5Lftma2r+YRG29EKkZb+0rZw/kyiFN QT6uxK++KtslZNXcJ1n0g1AJVd+LGeu+8ABrc/RPdp6C2ZY/OvZ01KIvcjcZ3V2Bkzw+03 8IojjI/Fcs4TgIhznI5fH3SK6e8LMwpoWzDUfHWYYJNQkajtn1Ot5Esmj4kGWw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792311209; b=Fk0XPoFHTpzSrrBV/QHsEo6yPmUXotHr5GxdF4lL+lcChtAqp7YevxBJPKHIwbnve9JHFp 5kGpUi8VxXLnnBwCL1VuIYJwHbLbg09B0tslBwMPML0dORCdbXYpcMxlnKNLG/gWHbKfgW txWrial+WR2JsS8iVWM4ujDcYhJ52OPEWT8f3NzymLRJ9NTEXDX7+30/BjQsQAR2Y5Ch49 ICJSvG6mJw4dMEpsZW0d3MSOghgjWYXklLimxYg/aBETebhZb9kVD9J5zVjDC9Ijhj9g9u MonjG0ZLIN3w4ChD2VjcegUV4IV9tymnMhoUMsIU4vfJZpdnGIC8wOs+9EewSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792311209; 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=SNeBCw4A3LPwHk4dxJ69yyQeVsxxSgTcGp04NGGx0o0=; b=Er8QbvoDPkEmFb5MWny8DYhUzD7vSbL4T2haXbFZ49uS6hWnaD3FkK7zkqhUPQbkEIbmkW FM1ZnjrB/zzWMBJemjxJ3AF5Z7NwxNQ80Z21vN2Clb2FuRQLMrKalfzeI59XszHGvB14MP j77OTyZ56rZ9lITWFGDJhYyRLEbjaTA0Zo+3Kei+J+sl929FrQKkxS63E9foKJ42qG1+tv kKNlqd2OO9fDycqZoohaUFHQDOypgvuujCtv3H9j/j0mhMBf9B8gmAYv45MQQPiuplRF/B thDfLjqhyrbLlGdkuN/tGTw+ucrXYMLYFGB5m7+20IebbggmeIPKiZdJwKIbhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j6rzF3SDNzjBp for ; Sun, 18 Oct 2026 08:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34108 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Oct 2026 08:13:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 6d1ff70551bf - stable/15 - sound: Improve some mixer return values and their handling List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6d1ff70551bf910dd82fd021e468a8d0265386d6 Auto-Submitted: auto-generated Date: Sun, 18 Oct 2026 08:13:29 +0000 Message-Id: <6ad47fa9.34108.605b7e6d@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=6d1ff70551bf910dd82fd021e468a8d0265386d6 commit 6d1ff70551bf910dd82fd021e468a8d0265386d6 Author: Christos Margiolis AuthorDate: 2026-09-18 18:18:10 +0000 Commit: Christos Margiolis CommitDate: 2026-10-18 08:10:49 +0000 sound: Improve some mixer return values and their handling Sponsored by: The FreeBSD Foundation MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D59078 (cherry picked from commit db62d784f02a913c7fca612b04585c633ba8277c) --- sys/dev/sound/pcm/mixer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 19bb28cbb939..7140da04e701 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -158,7 +158,7 @@ mixer_set(struct snd_mixer *m, unsigned int dev, uint32_t muted, unsigned int le if (m == NULL || dev >= SOUND_MIXER_NRDEVICES || (0 == (m->devs & (1 << dev)))) - return (-1); + return (EINVAL); l = min((lev & 0x00ff), 100); r = min(((lev & 0xff00) >> 8), 100); @@ -166,7 +166,7 @@ mixer_set(struct snd_mixer *m, unsigned int dev, uint32_t muted, unsigned int le d = device_get_softc(m->dev); if (d == NULL) - return (-1); + return (ENXIO); /* Allow the volume to be "changed" while muted. */ if (muted & (1 << dev)) { @@ -188,7 +188,7 @@ mixer_set(struct snd_mixer *m, unsigned int dev, uint32_t muted, unsigned int le (void)mixer_set_softpcmvol(m, d, tl, tr); else if (realdev != SOUND_MIXER_NONE && MIXER_SET(m, realdev, tl, tr) < 0) - return (-1); + return (EINVAL); } else if (child != 0) { for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { if (!(child & (1 << i)) || m->parent[i] != dev) @@ -205,7 +205,7 @@ mixer_set(struct snd_mixer *m, unsigned int dev, uint32_t muted, unsigned int le realdev = m->realdev[dev]; if (realdev != SOUND_MIXER_NONE && MIXER_SET(m, realdev, l, r) < 0) - return (-1); + return (EINVAL); } else { if (dev == SOUND_MIXER_PCM && (d->flags & SD_F_SOFTPCMVOL)) (void)mixer_set_softpcmvol(m, d, l, r); @@ -214,7 +214,7 @@ mixer_set(struct snd_mixer *m, unsigned int dev, uint32_t muted, unsigned int le (void)mixer_set_eq(m, d, dev, (l + r) >> 1); else if (realdev != SOUND_MIXER_NONE && MIXER_SET(m, realdev, l, r) < 0) - return (-1); + return (EINVAL); } m->level[dev] = l | (r << 8); @@ -266,7 +266,7 @@ mixer_setrecsrc(struct snd_mixer *mixer, uint32_t src) d = device_get_softc(mixer->dev); if (d == NULL) - return -1; + return (ENXIO); src &= mixer->recdevs; if (src == 0) src = mixer->recdevs & SOUND_MASK_MIC; @@ -280,7 +280,7 @@ mixer_setrecsrc(struct snd_mixer *mixer, uint32_t src) mixer->recsrc = recsrc; - return 0; + return (0); } static int @@ -785,7 +785,7 @@ mix_set(struct snd_mixer *m, unsigned int dev, unsigned int left, unsigned int r ret = mixer_set(m, dev, m->mutedevs, left | (right << 8)); mtx_unlock(m->lock); - return ((ret != 0) ? ENXIO : 0); + return (ret); } int @@ -813,7 +813,7 @@ mix_setrecsrc(struct snd_mixer *m, uint32_t src) ret = mixer_setrecsrc(m, src); mtx_unlock(m->lock); - return ((ret != 0) ? ENXIO : 0); + return (ret); } uint32_t @@ -1001,7 +1001,7 @@ mixer_ioctl_cmd(struct cdev *i_dev, unsigned long cmd, caddr_t arg, int mode, break; } mtx_unlock(m->lock); - return ((ret == 0) ? 0 : ENXIO); + return (ret); } if ((cmd & ~0xff) == MIXER_READ(0)) { switch (j) {