From nobody Mon Nov 02 16:14:43 2026 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 4jJGxc0T98z6xwGZ for ; Mon, 02 Nov 2026 16:14:44 +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 4jJGxb74prz4hb5 for ; Mon, 02 Nov 2026 16:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793636084; 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=wW9XdOCNmwO1AEri4gFYGx+Yp94YBR2L5jClpWA8tqw=; b=lbx1bAFSfPsY9LDnaiH28RdezYgPCUTknuzoca2gy6lTBQ0DB4F778pmn2/cAwPeo7IpkG QAmze6Iqqgtael+yx3q8t1pgWaD9W7yf6JuZAMwCoTdjRZKmV4yfvnvCLgwPnl8tCXnWBX ftW6nju73RoiaOth7mD4Tv9dlUc7RqPlo9gykZ3tpZ5BvGjY3F7z3f/s8IccHZhsoeW+rE TIfLhUypV5f5g1yIg/7wCB/IJYvJp6jX6OxMuY//EOhdqffWzacVFu61hs42RxVK5KnEAY Hz1oqtQz3u5dt6wF+MIVFm7cbzCjF9FN5tbQtsOp4uMLY6tT8+yLwuutQodhIQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793636084; b=F/GsXFzR9IxcXVTMtfIVnvYPQAesVrnpOM6vlSLBHhcJEmtWm3pB83S/2xZrqIvg3se2GG 1JzVjuQkwHTaKx5XHsrYGVyOK/WdKl/Gu0OyOOkT8p8UlHNyGBekcrIDvoXBWr+marQmpG UHjtT3Nbn52vGDr0EgrklIXkJqxQt2qro9n8rTatVHq3FOx+kYYzS8plVsxQMgmzrMrNMl XuFzYjdDtbWZMar4DLY9somlIg9BhwKSnihbDHNLJXkWnBIs4JZL6iRK5p3oUIGdAVxTqi BXpb5eaZL9sC4jJg0eifhhItnDuVpZiAy9NBKtbPR3HZ+y72g15+lrqeiGhFkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793636084; 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=wW9XdOCNmwO1AEri4gFYGx+Yp94YBR2L5jClpWA8tqw=; b=uUDGZmfpQmtJWh7m2oLKRNFrkDDNQUu50Qht5htpam0klfHv1CiOH/5tCOrnTvkV2CwsoP 9fQ3iRCJrTr+s05hYlYef3yfc47JJTSeny2HA9Nld6HbYWRtXTnysPHH4Nsq8bQwMCmw2C /U+pxQuDc5FQ6qX45T02XHeru58Yh1k6C7cHWGf0pY6qHBQjD8PeJQRASwnLPtLaaUOrnU fZk15agRwME98nEIvKGHIOue6lJdJZeVFRjlwRijEe2xJlPC5nVQMfPHhSP/u4URn1Ewlf 8zMwaMMZ3nQVZZ2yqF0DGpK1JOxA5Zw2uTF4vSd6TzHT3+L+7d6QKiWN7Xof8Q== 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 4jJGxb6klhzt05 for ; Mon, 02 Nov 2026 16:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 467d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 16:14:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: d33ab9dae2f5 - main - snd_hdspe: Use saved resource IDs on detach List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: d33ab9dae2f5f5421e4cb5a141751924e35eeb2d Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 16:14:43 +0000 Message-Id: <6ae8b6f3.467d8.3b858618@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d33ab9dae2f5f5421e4cb5a141751924e35eeb2d commit d33ab9dae2f5f5421e4cb5a141751924e35eeb2d Author: Kevin Bowling AuthorDate: 2026-07-21 03:36:41 +0000 Commit: Kevin Bowling CommitDate: 2026-11-02 16:14:20 +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 MFC after: 3 days Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D58373 --- 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;