From nobody Fri Sep 18 18:18:45 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 4hmgqT6TBXz6spDS for ; Fri, 18 Sep 2026 18:18:45 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmgqT3wx3z4NgS for ; Fri, 18 Sep 2026 18:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789755525; 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=+4clfSU5AKvVHSLrlvsHvEwinJpIdqskzPWGPFlc0L8=; b=YBT9AFCya94LzkQKddWma22LanVEKxHKy/HL6ehB/j3mBw/VfWhzz0fEDO3MALnJBzRrIt IYIn/W2GCgs97Xl6DVa9CpKDv8CoV4n6SoZVtNBCL+oBGUr++1SL6TZtxRnXLpfG0Zhc6m L/e/NGLksCeY0CUsvTaxQoOsyfOIDvatdwtJVgyWq1cJp77sbd8ySwd6ZSqgvAVL7sqKJL UuV804tA8BqU0E8GDxQFRvxz59xOzq1yxJCVQ4R/iBNal/vqxDmhVZ5RUC1c3RU1oL+yZJ LXJpsMwIwfKZhDplwYv6MXm+XPNkzP55BgWr4LLNIg7Jkh0x2kDo1nuj4dNgfg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789755525; b=ucNQ/7SlbA/GL4qXFY1kPzaxVAY0782fQL8B2n7lYFm6EduNzvvVrkMFkz+n7ZqXRHVl36 TIbZro0xj2t/n8cl6W5j2xQtWVuuqaxhlR5tfofGWGvi29xT3itU6bfCHgkPEmdlfzO0T5 6Src5X5KS5qRBo9qGIqmjKEAlFr5buuaNiKLn0lL2jIPONllr48viOxIfdYGU/ThTvtmwv IZ4KSrLu6SW5u9Q98CvKMWNj1qEBeeop03jxUCsd/cpQEemH0oHLhfHYSt4xFEmvDsugdF VaLFVww8luokh8DqvQBcPrUUpaj0DFV949krdrn0g5qEHT49o+RsZh6t01zgSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789755525; 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=+4clfSU5AKvVHSLrlvsHvEwinJpIdqskzPWGPFlc0L8=; b=CfUK2FijvdB0hUrY6KI46ABmV7+SwXXqOsG7dje8qdinYOLZwYU8FiKQ2VhRHOnLFoFGO4 Cp7qpYNGzFGPl/1TmZHw4HSCHkvAXLGqHuZlruZU/KKvP7/ZpBkYfYL55RZRv66l6sDv0w tOtVwKR+uiIbmf63WmMxLej9q7JOrGVteYwNTKfn5VWj3o1fly0BHZCItU5yoHI9Qw0060 NL7IU1DXQxy+B25DMfkcXpFlSVEC7IKqwr8S4JxrrOJis6ST0MvCnnXnqr/QkzleuCLu2N uxAXjdMCxH9SoNrUAm3ZJBZmZGlQQN/f33hCc+KsVgKPdnix71RvKYbmepN+WQ== 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 4hmgqT2xXczVdQ for ; Fri, 18 Sep 2026 18:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33873 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 18:18:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: db62d784f02a - main - sound: Improve some mixer return values and their handling 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db62d784f02a913c7fca612b04585c633ba8277c Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 18:18:45 +0000 Message-Id: <6aad8085.33873.3dbeea3d@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=db62d784f02a913c7fca612b04585c633ba8277c commit db62d784f02a913c7fca612b04585c633ba8277c Author: Christos Margiolis AuthorDate: 2026-09-18 18:18:10 +0000 Commit: Christos Margiolis CommitDate: 2026-09-18 18:18:10 +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 --- 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) {