From nobody Mon Nov 02 16:14:43 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 4jJGxj3mBsz6xwV8 for ; Mon, 02 Nov 2026 16:14:49 +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 4jJGxj0KNDz4hfB for ; Mon, 02 Nov 2026 16:14:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793636089; 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=tTm/HKOuA5ELorJdQNQ8/m3LGC1nd4yG7mE19EmKBf0EtWfdNiQMC8JkGjZMtzas3dzFC5 B0CfloFlRFEeWmR1PmJaKPzjwPOvPCxFdtLQUrYkYs380XBkBfW42oTlsND4RMUmq/MWCr IWirO1ZI/m8DKINXw2Jam1KDhl/BxFuosQT3CZKjAkbxtvOpXQLPOLUjEcSHOf2AEGbN7X gUKH8rFFu+gFDNkyMRVNJ1ecYUldFf1AtX+IiUkv2l35DaPG3FcMhowcFSxwkJ5o2kbflk 7c2rJWPi4F7kLkb4UkiFbVZddFAjIounpI+3qiPmht4EgqjAbz4VzhIJh99HUw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793636089; b=rlDIDPdlyGnA0sjcGcuWMIQNsiEmwfup5AFi/T0MXJwJAy6dw7XIkfWWR5ab+LoSsXQssL osAfX2+5qrlOFwSQ+VMwGmaX/6M1OSU2vKFtvEtcIlyujp8t2mTHMwwZWOoKr6LkWIBT/a +On1xNrhaL4BbUSyGhRkM3QIiYdzOWlTTmvHLp6y2xDphhx5JaKbFUxy8r2wfMIQTwXfy6 T+bKRljvaTsDnQHa87i8+3dwXj5KFas2EAj1GtQV3/SVbGNLP8zFCqPQrzd+kgR3zo3Zxy 2S6pmvT7cT+kBAoYMrkGBLW9JfL9xYvNIEi/ZkZSiR7mevxWlLgHX8IIywb8LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793636089; 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=XbtPn0MbeN21qSi8wZHL2TNHTBJFDGW7w69B+3uCul0st6N8XvJCCrxPofAX8eGzgXH96e g7A16sPvvnHsR/L9OnQyHDpD6mHYCBDSZr797sM+XjeDpbte+OVYMEJa+Y722KKR6hSzW3 wJO/17/f0manbFq13h7ccF2bdn+OdPPVXF59gaK9ojfJre6kbp3miMN3FGNSPzBFHdM5iH /O9jPR5D9zzhIr5gHf2Lsld8rS3ExsJG92MxQlwnVo/uxTVWDc64R6d7pTQXIhoVdcgQMI c6Is/o7jROBENMq5MZloXfdEj3WGT2O7za3aBUR6M3Gk7QHAocpwwr5jGmj2RQ== 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 4jJGxj009PztRK for ; Mon, 02 Nov 2026 16:14:48 +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-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/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;