From nobody Thu Nov 05 02:08:04 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 4jKm1J5BZRz6xwPy for ; Thu, 05 Nov 2026 02:08:04 +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 4jKm1J3vJhz4S3y for ; Thu, 05 Nov 2026 02:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844484; 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=NBCvrNj71r1O8F4Kt/2Vpniw0QzZRuK0H+rAliHGEqE=; b=J+Af1XiptkZ5FDmwAPyW9oeXlBjrWBuWxevGHjXIxt1LGIcxKSKauwplUmPjSsGVYHRHa/ 9qoRA2ZvNKbdPAe2pocpHXO0jXd1y7CEdejqT+a7Iy5au/of/ZAPWPgty0srHfVvxSr4xM bgOnkdFESBiUlLB4rzl6ogd0u8LwPpAozyTFbN3RxLy/Wk2thLRTvTUg4UaGqnpoyVZOFo ubMl9/cJjjyql+IKebc5Wy25xlXkWR2p89h9ZIb/9Pk+3vyDvISPfPbM18Vvd8EXZKIKi2 vIkDup6APMLRTX+RmdaFnoOJ/uHcxwxJSvUKZrv+Dtv8mpoqK2oHCNkZ1C6etg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793844484; b=tI1qswuHcFZ5uxomdOzouEAry1e8oTN3eDG2799Y77cYVz58kf8Z4po4k5FYZ2p+PQAcey h5+UdldxayaM4lRXACUPF6Vt2Wj1wa/+60/Yn9RwVeNPeyBPugn3nPlqcy8iYj0RI33+4g 1Oe96W2Uf3faGii0/NtJXPWj2vKf6Uof78BFNeeAxxJZW1GRK5hWii5ueLC2BK4zC8EJOr KhroSDtQ7yNwrxUk5FW0BTRMjj/Cn+7ciElKRdv2D0oPAV00kL/JTeG3bVCokqmEtIMAw3 jy5mw6TRfWNU5PJrigZjd/+Mf3u2UWMor9u696VRnXxMb74xAnpgjr4QIUo9Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844484; 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=NBCvrNj71r1O8F4Kt/2Vpniw0QzZRuK0H+rAliHGEqE=; b=Z+p63LltQqyTRz8DX7TsZ3KqS0Aln3dBeGC6szThmiHnv3NHKUJQImjStoP2NlC3ekjQ85 3T62mDL1VJRpetm8nfUISh2MW2/Lyq/E2nCfa8XGjIr9EYzZ7qRX7puTf2H2rezQ7jQv0c mqLsg5ilNgXJA7A9q0hlLIbnuHjIfRjtUrwAHqEoKSH94Sjx8ejREY90fCrMkCGAacysHS d2VW/qpvdHGXX9Cp8qSj/MqRYh5Cc2+xIKuGfTfuD/w7y79jWdFE4sJNlE5OBOqaUf2KNL Y/IFeCSEgkMHzgkW0fElbnCvw+MszDmZdjBnTI/QO3FqA5g3WfeFo0lEci/D0g== 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 4jKm1J3HDpzSty for ; Thu, 05 Nov 2026 02:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4653f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 02:08:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 94d836a0c8b0 - stable/15 - snd_hdspe: Use saved resource IDs on detach 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 94d836a0c8b0c6b645900e7bae03d3c255a47635 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 02:08:04 +0000 Message-Id: <6aebe504.4653f.566b9da5@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=94d836a0c8b0c6b645900e7bae03d3c255a47635 commit 94d836a0c8b0c6b645900e7bae03d3c255a47635 Author: Kevin Bowling AuthorDate: 2026-07-21 03:36:41 +0000 Commit: Kevin Bowling CommitDate: 2026-11-05 02:07:54 +0000 snd_hdspe: Use saved resource IDs on detach Release resources with the IDs used to allocate them. Rename irqid to rid to reflect that it stores a resource ID. Reviewed by: br Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D58373 (cherry picked from commit d33ab9dae2f5f5421e4cb5a141751924e35eeb2d) --- sys/dev/sound/pci/hdspe.c | 10 +++++----- sys/dev/sound/pci/hdspe.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index b129083f4b60..55ddbc8a55ac 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -203,8 +203,8 @@ hdspe_alloc_resources(struct sc_info *sc) sc->csh = rman_get_bushandle(sc->cs); /* Allocate interrupt resource. */ - sc->irqid = 0; - sc->irq = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, &sc->irqid, + sc->rid = 0; + sc->irq = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ, &sc->rid, RF_ACTIVE | RF_SHAREABLE); if (!sc->irq || @@ -291,7 +291,7 @@ fail: if (sc->dmat != NULL) bus_dma_tag_destroy(sc->dmat); if (sc->irq != NULL) - bus_release_resource(sc->dev, SYS_RES_IRQ, sc->irqid, sc->irq); + bus_release_resource(sc->dev, SYS_RES_IRQ, sc->rid, sc->irq); if (sc->cs != NULL) bus_release_resource(sc->dev, SYS_RES_MEMORY, sc->csid, sc->cs); return (ENXIO); @@ -957,9 +957,9 @@ hdspe_detach(device_t dev) if (sc->dmat) bus_dma_tag_destroy(sc->dmat); if (sc->irq) - bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq); + bus_release_resource(dev, SYS_RES_IRQ, sc->rid, sc->irq); if (sc->cs) - bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(0), sc->cs); + bus_release_resource(dev, SYS_RES_MEMORY, sc->csid, sc->cs); cv_destroy(&sc->pcm_cv); mtx_destroy(&sc->lock); diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h index 05c88594d585..04a404c6c03f 100644 --- a/sys/dev/sound/pci/hdspe.h +++ b/sys/dev/sound/pci/hdspe.h @@ -232,7 +232,7 @@ struct sc_info { bus_space_handle_t csh; struct resource *irq; - int irqid; + int rid; void *ih; bus_dma_tag_t dmat;