From nobody Tue Nov 18 00:51:56 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 4d9Qzw5fVyz6HH07; Tue, 18 Nov 2025 00:51:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9Qzw1Nycz3xYX; Tue, 18 Nov 2025 00:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427116; 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=pQBgQTaPyc9Kmwgzw1jg2PU4yHYG+S8EKwm4X1DnTF4=; b=ZEYMsRO29/YXaHRdDESbgV2YnT0NedaGron9zOy3pz6sy7oFLRl/Rms2ccypRCz0NP+0y6 0dzkKjtE7Psj9nHGmT2VY+pAzOseP2CAgDELq1CSdXYhr+ApTLWGULdqjEilEMCG0eKGz9 TJHTIJyjM7W7F4fIQ89blIhh0B1kwByXSpsld+3R+sa3RNDubsZQEP2KX0yvphwFjdXFAn PVcrd7KHBZBr9dKTT5+VMma/pbNh9uQgnzGKifFzAcFymj3C4SjxHWkFqLwLhh2Cy7VHov kt/hugWBspvDtw7WPCXfnywXYAZh8RCMVvU0X74C1p3h2QJDTw+ZRmYcwrQ+bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427116; 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=pQBgQTaPyc9Kmwgzw1jg2PU4yHYG+S8EKwm4X1DnTF4=; b=jYZKtBnHbpbLRuDLwfWt6iuR2fXFt1EaEwuIwm0p4RZGCgdECUtxHhABnHCeoObd8aTBBJ m3xsvq2/j7J37N7bYOkoZ5C/OywmEuASglVg6fOm/RTXrFsypxG2KT4RBB0oTXVWvU9Nkl NfIO58jFoLsJySjSR/8yfzi1IrTOpOa5d1Mv6e8L/1p1qTU5u9nwPVb9KxjyRtI1OIyZwq K9KdQFTyaZzyRK6pmtEFg7MbsH51Lx0ymLgRSxoYGWzIZr8TvO+y3issYjhgteim/ydMT3 0b53+YXtvTVVboTPIsGsGBiVKRb1ocEBbN6o3NIMMNFxm2HH/JUYrGaGO3M2lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427116; a=rsa-sha256; cv=none; b=Y1c6/1rSyijhQd+qVhvikEkVUD/L91sajdG+JPWSNS1MRNRdA5DB8Eor4+FJVr3Y2G9lxy hBKRMfkKiQWGMpA7j5WB1+u7+LREvIRViQBzzeTFwLfyt+pld4LLJlQmODbt5N5fIqOhkC Kwj+Tx7lVw3tBZkeo4tZwh+wlnoP08ydNiJcM8s/CpNCy/TX+y5Evq0/u6FYmUSA6XbwEC mJ4vL+Pzf6dEq8/9hk/8Cx8Qou+ZC07aOVRVCJOuCoxH7R/p5fIcpRl3vwk9SKKiAbNb+Z fYrG/cOjhToyaiTkfVOXHN6TCQobmdlqj+ML4sfeuWvH5UYREvSLnXTglQUvXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d9Qzw0nHCzY9P; Tue, 18 Nov 2025 00:51:56 +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 5AI0puko045043; Tue, 18 Nov 2025 00:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0pujX045040; Tue, 18 Nov 2025 00:51:56 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:51:56 GMT Message-Id: <202511180051.5AI0pujX045040@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: 7ed840e33127 - stable/15 - sound: Remove redundant sndbuf_free() in chn_kill() 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/15 X-Git-Reftype: branch X-Git-Commit: 7ed840e33127296d31b1098372aa6a23a7518fe5 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7ed840e33127296d31b1098372aa6a23a7518fe5 commit 7ed840e33127296d31b1098372aa6a23a7518fe5 Author: Christos Margiolis AuthorDate: 2025-11-11 12:05:30 +0000 Commit: Christos Margiolis 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);