From nobody Thu Nov 05 02:08:17 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 4jKm1Z02Zyz6xwWN for ; Thu, 05 Nov 2026 02:08:18 +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 4jKm1Y5H07z4SRr for ; Thu, 05 Nov 2026 02:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844497; 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=O/pP8J0VIrzXXjHPbMudi267p1ZKzkmFezWh/TpCpts=; b=pGqR1/kjrH1SvoxttV1H7Ap3J7+fytvKkqsGHE4fKmEXknfnRJwiAvHoSxWuefzokh8h85 lV/kk7FWYHQ1cdeU5+ProhF9c8za+GoG6nwKpMJGLPrvfJBnvGUpSIG5izi0jhjzH1dnyC D3IGMqYXE6iXAy5Yc1/WRLjcWTVeVpRZUE7vscMLHoOpGKATRjEekR3MDVkyDSnZKT2+Jo VWJYUrJojK9iO2qFJ254ipzN1Lz3eAy+SJaPPs196YNCE4NYMIJrXcc5GVNh7+ZvlWvw0O 01Kaois6+Y3KJy7IquobXC2Sv7xo7+yYX145TXc4WeDilb+ppP6QaQ7dx3CCSg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793844497; b=m3ObiLA2YRWA+IKINbwA31P4G+bc/mZBN0mYZS35At232L/qTb/UzPwHx1NxO29XCdPoyd 84QjBKDuzMFVu//VA0c9eczY7GtLG66gndfbSx5XNmOZVUYLeWGSkmn1EWPEf9F+numuF0 YbGUhoZUX/iwy5HM4WS6ucV8vN05HWxsUNcGIxMwAP6FMS5Bwc8zsCa3u6alZahZpW+AMi WuxsP9CkSrp8ro+SaatinB7sMIka2/cD2WWNgAv4crN1/rmpgZZd+RIZtLBafd0NcCuMtu lEEFo4DNFg9oQUIEKlnzgKkq9OSwtNNCuIfEYz/6D7QcniBP4vudgwezTb0LTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793844497; 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=O/pP8J0VIrzXXjHPbMudi267p1ZKzkmFezWh/TpCpts=; b=Dm5E4fzd9TcKH/rpS2iqcaDxiRVv3JxQGO7e9xaXPTDebRL7Kb3NFw6SpBTeCNXlYTiUeV UnMYSWNnS8YT4pum4XPC1nl/la+UH+OdFnF2NOrvyyRV55z5X9fcER3wn9fmoOS5kaD5P1 FMM/l00Rz7p4fB9LPuaZc3myAqWrYllnX+H65VOJgqppn3mejhFBLuAm5kVASsdRTEgSBg fU6cvqh4MPXxnPkY5X0Nl+OAB71et6Bi4WvIWDVwUfGir+boSIMZvshIJ7VuCPACOjmuKq W8PTjs2NFlagGv5OMD97L737zyp5IDAuq7y2sYosOXF9Q2QbSAoaUd0NMl3o2Q== 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 4jKm1Y4wFBzSv0 for ; Thu, 05 Nov 2026 02:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45ea4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 02:08:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 12d221772c47 - stable/15 - snd_hdsp: 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: 12d221772c47d3411b647da7cc7eb72075b2e069 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 02:08:17 +0000 Message-Id: <6aebe511.45ea4.761221f9@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=12d221772c47d3411b647da7cc7eb72075b2e069 commit 12d221772c47d3411b647da7cc7eb72075b2e069 Author: Kevin Bowling AuthorDate: 2026-11-02 16:17:00 +0000 Commit: Kevin Bowling CommitDate: 2026-11-05 02:08:09 +0000 snd_hdsp: 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. This mirrors the corresponding snd_hdspe change. Sponsored by: BBOX.io (cherry picked from commit 96e2a9a40a05716a444dc217629374c387efd159) --- sys/dev/sound/pci/hdsp.c | 10 +++++----- sys/dev/sound/pci/hdsp.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pci/hdsp.c b/sys/dev/sound/pci/hdsp.c index 3c92eb3e319a..efe7dfcac88c 100644 --- a/sys/dev/sound/pci/hdsp.c +++ b/sys/dev/sound/pci/hdsp.c @@ -179,8 +179,8 @@ hdsp_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 || @@ -267,7 +267,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); @@ -1050,9 +1050,9 @@ hdsp_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/hdsp.h b/sys/dev/sound/pci/hdsp.h index b30845fb4bb9..5b8a826bc161 100644 --- a/sys/dev/sound/pci/hdsp.h +++ b/sys/dev/sound/pci/hdsp.h @@ -238,7 +238,7 @@ struct sc_info { bus_space_handle_t csh; struct resource *irq; - int irqid; + int rid; void *ih; bus_dma_tag_t dmat;