From nobody Sun Oct 18 08:13:28 2026 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 4j6rzD6Lnxz6jxlD for ; Sun, 18 Oct 2026 08:13:28 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j6rzD3DsCz3KyP for ; Sun, 18 Oct 2026 08:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792311208; 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=oIZBLt6SaEiJ+h8e7EnKIoK/YzVSlcGb55HDgnZ80dM=; b=QVo3odeSdX8HUnPQTvj7SNaT9r+orsegEjNcVwRhigS11pjoVgVLPiFIIsVtWPZ33wZXGb g0a3XUhU2DLBpX+zpvqyZX+wG2FJPonocbOHLeuPhpIS1e5EKZ3U+tTMRunAKrCip8eNnY Ze24ljzHx+pXFVBjM/J2e9EJ45tq7IKgDyD5+wccrCD6/7WggOLLgYXcJOKGdKTTfn5Xhb 8otIYcGqdIeOli5ylM9Jq8rj1MYelujAqHUkAVulo4TjfK4dlAE0rn/XQ/1K2uhIGoHdIV ADy1tWu1iXv9UN4exTegKdLMofrvHQCuo7XB6kbTxtDmoYEmxqXcWWAqhzUWwQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792311208; b=ub4AYOM5iWoTZPPrBpNhgSPhHp4sGTBOlrqMO7sDXf9mkISLCPOEC8pxyi7EzviIk3zXdI omNGVImTc4ocRJyv/Ru+mITV+jfgdcV56EXIxiOSlahCtvtv+4PqIUKL7GVA8Nkr94k5eD dHXb9lImwPNYb4WnRw1n7fFVfv+rgga2lRL4KNkjr0i964vnI9wdnqNk0Fd9JOKgW79V20 Gfu0ValUsq9oWzG25T7tn/9s1lGwmFF+VCx9gJd9H36rbiFnbtotMopXVj2T0ODFUcRJoo Dun8FdX1S9y6euBr6EA2TlgMkPdNLaJgZuaPWYuuD8B5PKL/jRIcNCUgH3FNKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792311208; 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=oIZBLt6SaEiJ+h8e7EnKIoK/YzVSlcGb55HDgnZ80dM=; b=iOGg8cWzQLr94C8ZRvLYcmoSxhAxziUWZd9GtI8ZS2W9xFnhqOKBGBAULiqvCA+oA0wa/J biliayxTlsTUXBK3QMSO5gyoMBkR6rl/BFpWyWOF5vElDwcVhlOfshE1mWYgajPtZ0X9oS 32tqbpxPX1ERMgv9D8/ywp3dF6j7WcPUOlMCTKvG119aTlzDu/EosTqG6nveRF81cMsFAy h/LN1Wm2ZISk5aF8/hIxyBArC5GyeDbDDZlh/5hmbOysBTHidPEp5jI2N8sSZ3os5Q2idt Ztm2OJ3T5UrwOrhxdx9e4xC9IxQRpDL6TouKX25GJS/+6If7NNm9v+PyZIqZig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j6rzD2MprzjBm for ; Sun, 18 Oct 2026 08:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34104 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 18 Oct 2026 08:13:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 332d81cd2f0c - stable/15 - sound: Reuse mixer_delete() in mixer_uninit() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 332d81cd2f0c21522151e82d0aafa44a8ffdf797 Auto-Submitted: auto-generated Date: Sun, 18 Oct 2026 08:13:28 +0000 Message-Id: <6ad47fa8.34104.268bd83f@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=332d81cd2f0c21522151e82d0aafa44a8ffdf797 commit 332d81cd2f0c21522151e82d0aafa44a8ffdf797 Author: Christos Margiolis AuthorDate: 2026-09-18 18:18:01 +0000 Commit: Christos Margiolis CommitDate: 2026-10-18 08:10:49 +0000 sound: Reuse mixer_delete() in mixer_uninit() Sponsored by: The FreeBSD Foundation MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D59077 (cherry picked from commit 6c735475aeefc626962818c0ab8749aaeb6de9a4) --- sys/dev/sound/pcm/mixer.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index c0d05b5d195d..19bb28cbb939 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -519,8 +519,6 @@ int mixer_delete(struct snd_mixer *m) { KASSERT(m != NULL, ("NULL snd_mixer")); - KASSERT(m->type == MIXER_TYPE_SECONDARY, - ("%s(): illegal mixer type=%d", __func__, m->type)); /* mixer uninit can sleep --hps */ @@ -633,11 +631,7 @@ mixer_uninit(device_t dev) /* mixer uninit can sleep --hps */ - MIXER_UNINIT(m); - - if (m->type == MIXER_TYPE_SECONDARY) - mtx_destroy(m->lock); - kobj_delete((kobj_t)m, M_DEVBUF); + mixer_delete(m); return 0; }