From nobody Sun Mar 30 21:29:30 2025 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 4ZQnTR0cfYz5s6nF; Sun, 30 Mar 2025 21:29:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZQnTQ5Mkjz3GBN; Sun, 30 Mar 2025 21:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743370170; 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=CvtBFKYVHBTZvWomW1w5avSrjq1yYsZd56JdmLv96+I=; b=YV5ENHO892Jpd5bR5tbWOmD18NA8gTVO8vXWY3RvBlXySmUK/7IJh6m8t3HbjrNIvOXG9L clrd/fFXsjgqoeIJ2x2xPqKb8sNrXKvGupJdB/axdcu2mEz8M7hGyv9HkxazwWqBUSrHM0 YgFBImEF5Qj2G+rR9rPINvvvuqCncVKo6PClV99gDh5b3PQ1dM3CouMcwbRHBUw2x+Wzae 0CoHbY1zl7O6u3gYnKDdtPVGoAvaclbVYOZ2yZ6Q5pfv02PJHNmTf46SRIhxL2mA/n0k6S zLwUCsyd0PTC0XrDF10R92+gfuGzHOyypiUrttqbkBw6wK0AHNU69xusX5ki2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743370170; a=rsa-sha256; cv=none; b=ijw0G3fJ7VVRCaf4543xJ9e1yyEVM3My1FoFd8WjDNB4OhJ2htnSn7lkysILTL9Cgu0h/R I88a4v5pj3U8OqqZCy64QL0q0zR+Ak1mtvqICPgNI8TkadDK6DZXgUhYOepdgtaQlwXmbN liHTomY4GlbIUje4L0KfQTop0Uyok+5w7rlCmBuAi+wX6q4yCw8fGvtOpK2OgqWDEAW7Nn Kog2o/5N2TQI+qAkA0W49HD4nXXACCd/NnamW6VZReQH4Tw6M6IDSFlLy1HWzEOI09NX67 HnPAdZn9NvBXNPdwnQGikVNS71vzlupmxqMuVCZNNqPUkQi01DAgb0Ab1GGbrg== 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=1743370170; 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=CvtBFKYVHBTZvWomW1w5avSrjq1yYsZd56JdmLv96+I=; b=bUvVk3TB3yw2Aa76mjU+wWsTeZcZ2Rw9ePXBqmBnvmfAL7Wo/GCbqcHIzRs/qFACppcEph UKbvjXavHYfyI4HeifLnCdJFaunabcRv3bk1my3WnOJ+W4eLnmKWO9VeNS10PzkNZL/87B dMYQiid3Dln11iXS8vVXzfBJIZepM70wWxZBm2/CwYtnoxjYnZdocEzrb5kmsDxLIlobCS jSQR0aoyjKc9J/3/gI60SoJHOJkfjZB279p+BpNPihsv42pkDgk+TZ8uzHl5LxwaTC5xzM PcG7Gn+T1i0xPWyFYwsPajLKIUaibQ6mq3BKCUOAYd9yVPRAU5ghjQN8IKZ4RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZQnTQ4J1Zz28c; Sun, 30 Mar 2025 21:29:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52ULTUdd071986; Sun, 30 Mar 2025 21:29:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52ULTUO7071984; Sun, 30 Mar 2025 21:29:30 GMT (envelope-from git) Date: Sun, 30 Mar 2025 21:29:30 GMT Message-Id: <202503302129.52ULTUO7071984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b6420b5ea5bc - main - sound: Fix regression in pcm/feeder_mixer.c 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 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: b6420b5ea5bcdeb859a2b3357e5dbaafe7aaff88 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b6420b5ea5bcdeb859a2b3357e5dbaafe7aaff88 commit b6420b5ea5bcdeb859a2b3357e5dbaafe7aaff88 Author: Christos Margiolis AuthorDate: 2025-03-30 21:27:09 +0000 Commit: Christos Margiolis CommitDate: 2025-03-30 21:27:09 +0000 sound: Fix regression in pcm/feeder_mixer.c This call was meant to be the default case in the first place, but somehow missed this. Reported by: glebius Fixes: 4021fa32d92d ("sound: Simplify pcm/feeder_mixer.c") MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/dev/sound/pcm/feeder_mixer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 1d3b7e31d055..b6b81ad9a51c 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -337,9 +337,11 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, feed_mixer_apply(tmp, b, cnt, AFMT_S32_NE); break; + default: + feed_mixer_apply(tmp, b, cnt, + info->format); + break; } - feed_mixer_apply(tmp, b, cnt, - info->format); if (cnt > rcnt) rcnt = cnt; }