From nobody Sun Apr 06 00:28:32 2025 X-Original-To: dev-commits-src-branches@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 4ZVY9F4swfz5sbSL; Sun, 06 Apr 2025 00:28:33 +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 4ZVY9F0XTyz3xC3; Sun, 06 Apr 2025 00:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743899313; 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=tqueHYdWUYiJQkHAF7W4HQdsC3HUwMTHFg7L132QwJA=; b=XjFHSjXhA287ksSUj1qYeIH5b3c81mwiPqOeoisXj8uOaLRciqPf8sPLc1RBCM1B/EWZdq 6QJ7tb8mE2zlP/66IDKRIkMzN9Gw1Jvy1yHfeRS+tAfPb2DzRSdC7mWnoqIHX/o0Xu53TR pEOebuf9ar738jcCzBfDetJfWYcLAvvQvSMfWnKk9M95UGFyR03Q8IyjbPTayj7UeKqzia XIeOwLQ8oOS2kT+wxV4YnqVXhX02oInKCPBtKebXWd1RX0U8RWzrys18JOf27P/xFH77cq K/JQRtM97wBOOZtYRZQxPv59zqXxi6tAOrbYfj1moHVeEyIZ9iTeEv0M6RAbzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743899313; a=rsa-sha256; cv=none; b=HxfPS2acywGEPla0gNwnpPaOV/UJE28VyCfwGyGJZApVVUwUInWbheW0UAuXm87UG25kN8 0GPxdUF/6U3XyYrXFvwv7oJi+hHmExSDZAZMSBgHnubbG/RlZ9ry0qgKmItn2z3/sriZ9Y Cv5NwMCIc0KsIAne1lKj9pArup1tiuRAGYvF5//Pc88f4ZzzlQ6PW5GjoNT/Tx1eK762vz mV+Zvpu606zh4zNAHEXeTmmNt33BnfoPWK4DsQuGLVmA+CvTg3Yyh+FlQTgFZYwl2FW1m3 Nz+wwpAHwn/RmiIdSBL1JdS4z7Ee3/V+Rbla4rWbrG0BY08FxutnIjHZG6CdFg== 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=1743899313; 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=tqueHYdWUYiJQkHAF7W4HQdsC3HUwMTHFg7L132QwJA=; b=aDpCzdJyGW90OckVLmHzfCJa2SU1kR3dgvD8+I9VYxbUjg9jE7WiA5vuCC8Xtntbj1dxJJ c2kKtdwJbtpoUtN+x4BnPP0djrCBb2XNC8UVt6P7IRV9OYRQv1pZvgRfX4Po9Ia8HF5GRI RjGyqZOHw7p9z595YsDDh43QsIMgUcHGlgvF2u6E7/eWJYSCA9cED7u9q0v+3RLBTl/Sd9 7dD1hF5umy9wn/mMOC7TbQC6qZLcqmLkhG4MDhAwyIFUiOPvTjvl1vvrt6KfIgg4kfKkae KPwp6bsKjtRszSuNSf6ruSiwJWbrdG4LzQfblUTYho5NkkGu862DJcVp78b3+g== 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 4ZVY9F049rzfjv; Sun, 06 Apr 2025 00:28:33 +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 5360SWl1065853; Sun, 6 Apr 2025 00:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5360SWUN065850; Sun, 6 Apr 2025 00:28:32 GMT (envelope-from git) Date: Sun, 6 Apr 2025 00:28:32 GMT Message-Id: <202504060028.5360SWUN065850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8c991c4b0695 - stable/14 - sound: Fix regression in pcm/feeder_mixer.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c991c4b06954371886413d7a4eb2f0569721857 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8c991c4b06954371886413d7a4eb2f0569721857 commit 8c991c4b06954371886413d7a4eb2f0569721857 Author: Christos Margiolis AuthorDate: 2025-03-30 21:27:09 +0000 Commit: Christos Margiolis CommitDate: 2025-04-06 00:28:15 +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 (cherry picked from commit b6420b5ea5bcdeb859a2b3357e5dbaafe7aaff88) --- 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; }