From nobody Sun Oct 20 11:21:28 2024 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 4XWbc843nMz5YvTN; Sun, 20 Oct 2024 11:21: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWbc83crzz4WZf; Sun, 20 Oct 2024 11:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729423288; 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=2MVTgkikKvWMow8bc3Ycv7+jRx+lewBlupSVEv6wnIQ=; b=CKVCaFGmA5AMHT+Sv7SaAsjQm7oKMVZ4W4vKMzXeS3H3WSkM54yqpRq2+mLp+b223VV3VI +F36XFSCdpgxbxx2iFAeVhAW24zWqPdqaR1okfPf6o8mby8WFG2OiBSfxKxO5Etou5DgzI /icIu47DL3AryjrSmk93hGg36XdyPBJ4ncBh5qNe486aVJ2jQUN+2Mr91MrluMr9D6SF8w hji8BQsvRIyEQusPsYexRRKB9MnHtGVxi5LOoeFcuqkgWJrGvcpc9Kq/fVzLcrL9Iyz+2N dKLCAHIzZYJAbpE6AICaE3L5LlAN6oIxvj2yc574aaxBkmWPBlqMsrsZqOzWeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729423288; 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=2MVTgkikKvWMow8bc3Ycv7+jRx+lewBlupSVEv6wnIQ=; b=tEWlIztyK6J8GbK8xa4ta3pAyc5LQPZcG2/XB5IvIHukxQIrAaTS/Vv+219fDYRXVf4sWY WSqUNmenQ7Itdij4GY0r8PArbxnHi5DFhErMOdPYFrP3pOGO/RBnbxG44SkAtKV1g2rafV ExFjYWDyTRCX6DoqSdtHo397HyMsB4gI8cnx/fZdqZwhNYG22pCFZjL726zuRJrSM05aFr eA6t91JSxgkfXvEgV+7HaCfN6fxYlxPiNyKCyJJYXM0yxh7gTS73GDC8I5UqoWXRrfxl9X +2MfdMXWFw6lpDAyjsahtNGhT36m//bLSqnkwuWK/CFvLxErf5EZuCJU18B41A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729423288; a=rsa-sha256; cv=none; b=HIDbnJszJC+tmfpKoTYCgUw0iwSpoNdxU07iHYh2r7dSTwPqnKITU6+GdxXcVL0+t1xDHt v/VAbL+e87194DptsQbuZmr4iki9rsO/YSHOa50jZ7fRBrezO5HmyfwitXFuxlLF3ZxOd1 8Y7x1srjdTNjwzj35rEASL7R9X+ByecgEKqDXhffyOGKSxkkHNXRPPBF4Iv7ea65TwCpHX 2A8he/YN4nj6uLjbPwAPYfP88VhhzoAldy6/PODRZ6EIAH23F2Fn83gnkgoq3d4YhO0jbn CEKPgu0mVF9i8I85ag8jBuhvbCJku1+wnEDLgTZPpVobNHe7KydceZWlz0yAPw== 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 4XWbc83DRyz10Dt; Sun, 20 Oct 2024 11:21:28 +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 49KBLSVL061328; Sun, 20 Oct 2024 11:21:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KBLS8x061325; Sun, 20 Oct 2024 11:21:28 GMT (envelope-from git) Date: Sun, 20 Oct 2024 11:21:28 GMT Message-Id: <202410201121.49KBLS8x061325@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: e1eaa312d592 - stable/14 - sound: Remove KASSERT from vchan_setnew() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e1eaa312d592a8cde8c9faf49e026a4d3f47489c Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e1eaa312d592a8cde8c9faf49e026a4d3f47489c commit e1eaa312d592a8cde8c9faf49e026a4d3f47489c Author: Christos Margiolis AuthorDate: 2024-10-18 08:38:31 +0000 Commit: Christos Margiolis CommitDate: 2024-10-20 11:21:04 +0000 sound: Remove KASSERT from vchan_setnew() This check is not really useful, and can in fact break things, if sysctl_dev_pcm_vchans() calls vchan_setnew() with a value that will not satisfy the KASSERT condition. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: dev_submerge.ch, emaste Differential Revision: https://reviews.freebsd.org/D46545 (cherry picked from commit 998de46c51452b046ecd9ba8ed592dd7c4f79f51) --- sys/dev/sound/pcm/vchan.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index fa4fa2023b71..c1ad9b9ec2ba 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -945,9 +945,6 @@ vchan_setnew(struct snddev_info *d, int direction, int newcnt) return (EINVAL); if (newcnt > vcnt) { - KASSERT((newcnt - 1) == vcnt, - ("bogus vchan_create() request newcnt=%d vcnt=%d", - newcnt, vcnt)); /* add new vchans - find a parent channel first */ ch = NULL; CHN_FOREACH(c, d, channels.pcm) {