git: 7ed840e33127 - stable/15 - sound: Remove redundant sndbuf_free() in chn_kill()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Nov 2025 00:51:56 UTC
The branch stable/15 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=7ed840e33127296d31b1098372aa6a23a7518fe5
commit 7ed840e33127296d31b1098372aa6a23a7518fe5
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2025-11-11 12:05:30 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2025-11-18 00:51:22 +0000
sound: Remove redundant sndbuf_free() in chn_kill()
If b exists, it will get destroyed by sndbuf_destroy() (which calls
sndbuf_free()) a few lines below, so the additional sndbuf_free() here
is redundant.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D53527
(cherry picked from commit ad28c6a13a45746f32cbc832b3fe58748fae0d19)
---
sys/dev/sound/pcm/channel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 749ee4d9cdba..54d8976d46bf 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1373,8 +1373,8 @@ chn_kill(struct pcm_channel *c)
}
free_unr(chn_getunr(d, c->type), c->unit);
feeder_remove(c);
- if (c->devinfo && CHANNEL_FREE(c->methods, c->devinfo))
- sndbuf_free(b);
+ if (c->devinfo)
+ CHANNEL_FREE(c->methods, c->devinfo);
if (bs) {
knlist_clear(&bs->sel.si_note, 0);
knlist_destroy(&bs->sel.si_note);