From nobody Tue May 13 22:02:53 2025 X-Original-To: dev-commits-src-main@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 4Zxr7d23bjz5w3Xc; Tue, 13 May 2025 22:02:53 +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 4Zxr7d19B7z3vps; Tue, 13 May 2025 22:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747173773; 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=1JxibNK1gD7os1mlwaHdYOaKbvow4iPynBwEIm5Rdwk=; b=eWe8cLd1y5kvAT/90TlV0TVDV+19h9jkkSvOmSo/QtuGgo42WYC/RZglqkA03IJYMR7mtp +0tGXhSh24l8GCxpS94PI1YRG6B3Wk0dLYpJeKhiZZV4WwX5KO/Ww1jqJNEkz/ZnIcoTNo LrhreVU4vppd/f/vxLohwNLwjOlg6sWp4yWVT4Rb1qf+QolR66pfZaYNW529JOj8MDbNR6 +Jl4WbhMLdCxwZSSjfePCPsVrz/4VJYMuYDQqqZ6+atCemL5Ojl4R1uqw8QW/YdVaYLTgA 0EYVAmlI/v88ce0qVTtGeGYAJZHzMy9Pzh64zdq0LXqepxQv57kSxJbfLwbqcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747173773; 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=1JxibNK1gD7os1mlwaHdYOaKbvow4iPynBwEIm5Rdwk=; b=F5KueuQD23Z36FmZETgXVJ09a9n5HYqUI2b75pVmt+tFa1/S7BH8Q4du2CBxJ6fDlvk+RG J4yjUR7aA3VTe2sCTJnwTtKGie42KqA0yVbWvMDazRhYx5D+ndItsTZwJ8P1WZ/4BSbxLC XppisstImlXHDeSfGS7RA86Q+AoIP+b3bF7UVt/Rfpzo3dfDxvsCOYB+mkFdDLJre22wMG 1BKjJY+0dcMzSUqyqBIL8u4yZcAciheIINoHNHNl69PMHIBkZ8g91oP+uxNXQht9x6EuKg yaWr3n/tuIqd3IL8lfIrZ0BYRFdEMPDzMo4bJg42bNYjseUHvarzHkbTISBXDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747173773; a=rsa-sha256; cv=none; b=pLo6tMHN1xbILBzsFSAC1m9pZdEwlC57Y8XiSKw/PL+9Ye3+oPvX4FOWEcSdSaCI6xf0Hl IBptJ62rjcrinO8IO9bjeV4SILyUKBWzPmA3N4AnjL6SQYIwZK/GbpOYo95UDX2MvsJHPg TOtOztLpZmOsIdC1Y/9SUL1krh01PvGgzSxrUSTQdznpJXKxfkQ2BgXBFW4uyaENxAz/72 HazmuCsBK7W0ZI9jzghJStUvAWNdG+LEScPXL1Z+/+rtm5bDE6BQWXZQIppu3lf2mIewdI KBmwLFMeLjv2hTY2IgtxlW6alFO1Bw52RIyI3T1K4lpR8BsHkfzMpcxGt+EA/A== 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 4Zxr7d0mJwz14BK; Tue, 13 May 2025 22:02:53 +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 54DM2reX026115; Tue, 13 May 2025 22:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DM2rdV026112; Tue, 13 May 2025 22:02:53 GMT (envelope-from git) Date: Tue, 13 May 2025 22:02:53 GMT Message-Id: <202505132202.54DM2rdV026112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: dbfe79bbe5d5 - main - sound: Call PCM_RELEASE() if pcm_addchan() fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: dbfe79bbe5d5ebe296fbff2d101e0994d7881d0d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=dbfe79bbe5d5ebe296fbff2d101e0994d7881d0d commit dbfe79bbe5d5ebe296fbff2d101e0994d7881d0d Author: Christos Margiolis AuthorDate: 2025-05-13 22:02:41 +0000 Commit: Christos Margiolis CommitDate: 2025-05-13 22:02:41 +0000 sound: Call PCM_RELEASE() if pcm_addchan() fails Fixes: fd906e47b18f ("sound: Simplify locking during device creation") Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50337 --- sys/dev/sound/pcm/sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index f6c35769e7f3..e690b53c411d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -139,6 +139,7 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) { struct snddev_info *d = device_get_softc(dev); struct pcm_channel *ch; + int err = 0; PCM_LOCK(d); PCM_WAIT(d); @@ -147,13 +148,12 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) if (!ch) { device_printf(d->dev, "chn_init(%s, %d, %p) failed\n", cls->name, dir, devinfo); - PCM_UNLOCK(d); - return (ENODEV); + err = ENODEV; } PCM_RELEASE(d); PCM_UNLOCK(d); - return (0); + return (err); } static void