The branch main has been updated by christos:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b6420b5ea5bcdeb859a2b3357e5dbaafe7aaff88
commit b6420b5ea5bcdeb859a2b3357e5dbaafe7aaff88
Author: Christos Margiolis <chris...@freebsd.org>
AuthorDate: 2025-03-30 21:27:09 +0000
Commit: Christos Margiolis <chris...@freebsd.org>
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;
}
