From nobody Tue Mar 04 15:46:54 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 4Z6g671V6gz5qGbB; Tue, 04 Mar 2025 15:46:55 +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 4Z6g6656zkz423t; Tue, 04 Mar 2025 15:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103214; 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=tVOTN2hwfYmZ/726dmXOOoIhpjC7RS/W4XVzKorZ7PQ=; b=Po1RbyiTIYDWP9vnhaeXMtlMGc9IhFhzsIaCS3vvUt12oStaphs1+Ebcy84ld1dI7tVrKE t1YNdx0VOGnpd0OMGV6ISnP2pGs5jhpKSJyYRriYZJzMlH0/bnvFHkhTMVpVvtRT1U8fWs K0H83GABlPU4KS5ezv389GTNP5TgJDelVTbrKzCYw9Zvn+VoPu1tLeogShcSwTHoyhL/Na dkJBDFK4QHRFcgRxgeeBitOcH63VBzoldFJys5cH+Hg86f2VD2ETBDDg5OB9tTcwe7/Z/X Qo7Gj4Bp82rW9xn4fnaGqSFO0iRM4H9G3puB8Rh9RGslPvNweTxT8QxiorbS1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741103214; a=rsa-sha256; cv=none; b=J13G9EfKjrmiT5FbFSwdS7LbcZaiO2CQkjIvEoCXpNNXAmz6iF6yrGmTKllyLLjChJZcU/ rCkin2wKje8NVI6YDV64TCzqmSwomW11+HAF8d2kkt839I6oRy4XWnRClNlGAMlDescfMH q+2SIltmEfzP92/H2FqYxD6Xrz+3WNfPfNBHxC6G42Nee5xY3Ne/O/MonihD493pQDEvPC PIq4E6k++98xmGW6MkfYfh/GLVDnUa2QWguSzHvXxf/KSgywywAxFW1V0XmJWqC0Y+Llml eO8HaIWPQ+EPonJJ2oVjkk0cZV1pbsRlCJX2vhL/bqndoFzJIHnP/cWZtnBGLQ== 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=1741103214; 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=tVOTN2hwfYmZ/726dmXOOoIhpjC7RS/W4XVzKorZ7PQ=; b=pZBgFjmi5+5B/KueSrYPVGqyVe/2CvGek1GtD4WLRgfulpGVJDPm0OilLIOmdeQx/wpb4r Ybg9quMdv6QJVnZwn7WavA38q8jvOAVzBpXb2jI4TEVQ/ypeb2c/yl1pu/3enJSrAPxLYh +UqfPsgFVqyijnz1glm4X6SJ0p0KWaoIV6DVZ3UlkmCk4HciTJ/NOBXufJUlKWALiIA9LW GOfWG8u0t/7C/k/bvQoCrcBlJbe/ecPFWB7AZzf/u1HEjQH9sdHSdki4Y1W3qX8njrEZMX IZ8RHVfuhMKLPC/wbaLoAWvdqk1+t1JhDPPWhkIAkCxsOtzH9zdoYKnY7nacYg== 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 4Z6g664jHCz85N; Tue, 04 Mar 2025 15:46:54 +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 524Fksaa049732; Tue, 4 Mar 2025 15:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524Fks5p049729; Tue, 4 Mar 2025 15:46:54 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:46:54 GMT Message-Id: <202503041546.524Fks5p049729@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: 8233ccc3bcee - stable/14 - sound: Do not fail from vchan_destroy() if children list is empty 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: 8233ccc3bcee6dbe6179eca605d8a354a861cf7e Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8233ccc3bcee6dbe6179eca605d8a354a861cf7e commit 8233ccc3bcee6dbe6179eca605d8a354a861cf7e Author: Christos Margiolis AuthorDate: 2025-02-25 11:43:11 +0000 Commit: Christos Margiolis CommitDate: 2025-03-04 15:46:05 +0000 sound: Do not fail from vchan_destroy() if children list is empty vchan_destroy() should be able to call chn_kill() regardless of whether the channel has been added to the children list yet or not. Also remove the CHN_F_BUSY check. There is no reason we shouldn't execute the code below if the parent is not busy. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D48185 (cherry picked from commit 405b1e50926d4162fb9503644073c0184a8b37d9) --- sys/dev/sound/pcm/vchan.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 4165d0712b94..ea8a50b316fe 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -838,15 +838,8 @@ vchan_destroy(struct pcm_channel *c) CHN_UNLOCK(c); - if (!(parent->flags & CHN_F_BUSY)) - return (EBUSY); - - if (CHN_EMPTY(parent, children)) - return (EINVAL); - /* remove us from our parent's children list */ CHN_REMOVE(parent, c, children); - if (CHN_EMPTY(parent, children)) { parent->flags &= ~(CHN_F_BUSY | CHN_F_HAS_VCHAN); chn_reset(parent, parent->format, parent->speed);