From nobody Mon Nov 02 16:17:28 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 4jJH0t396rz6xwH8 for ; Mon, 02 Nov 2026 16:17:34 +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 4jJH0t0mYVz4jBt for ; Mon, 02 Nov 2026 16:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793636254; 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=kZUxJT8jqOUgqVCI57EuT3FCKppnojK1j8XgOtdVSPA=; b=HijbSg30q8uR7guxm6G8tbqHluUVJlvYbtYSzVUBSYnrJjewHQgTFx4MGovRgECKWm396r IVo7wP/xhC9qipxPvloGByDcMGjjUcIKAYtQ/WdR23nn6RFGGqSGmVW9Qx2AYC2g9mPLyI uVoEx16NcVWA7nodqykvQZ+Jh645bLf9QSqL/xiUmY/dWe0f50AsJrA1xIFfVY7oMBsCVl jf+2Wb6Q+05BpMHjCfEg7Xbl1WTxFnYqK+zAZP2Hs9ZCvPHmNvvva79jJu6Dopcb+hRgp0 iVCuIw0KZcfHu+lLY3hLjXSjKG55mbUaXe0ioVkMhrLZBQ8rH2gULxphT2NHfw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793636254; b=bD/v7KqXW+EStzJ77ErcqirJnYisL7ykMHGSJpDHE2oWI0cnBZIS1ImQM8WZLvaqEu8S4u Te5T8YGLI+TnpgbzJkjz7y+aICGOrMCPSsynTJmMWM+Lt60jJrWGS1z0cW9eP8rgBRDW5p qFHi0vG1tl+g9SM30ytYOSkWosGStxL6ojdC1Y9UZXNREvAWJ/jmnefVFbZE5YSs0yEs+i UkK49LjTwTQhtX2P17G1CVGwP2/OJjPkF+dQCXbGODxtW8qGEmBQtSSTwMnIksvZo4dX5l 9VE4KgSAFTIvrRHCBTNpWpZvsXbaaKBM26UG4ugTyXSEONcX7bAn35eEfQPkfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793636254; 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=kZUxJT8jqOUgqVCI57EuT3FCKppnojK1j8XgOtdVSPA=; b=wQypmHc6lrSB3kRzzLUgNRjUPvXUqpYHHAzdh52AaI4Tb8Md9WDonpKyU24XSxZfkVlcHx MLc16fOJgsK4WUhZAmP+6l6wE2eYUdQjXldwytW4YFQR6SdZacZ0OOlUzRScUSAdbZIYOE Y01UcnY317Hsh8+SG57vshd5LkryXytzFFp2w2LGZ2ICip9GbN0M94uWZSgnapeHQqFJCD m0+O94oi3aptOGGlqtwTiEjH7M5sXQb9La5RE7RI8pbvL66vZacuEjvo6ybPgft1SHOWeK ujFLLvKFPO/EnYfincQ2qzFaR/tV8I4dk5vJKQXL6LoV62tydvorctZmeN7JGw== 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 4jJH0t0RM3ztH2 for ; Mon, 02 Nov 2026 16:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47706 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 16:17:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 96e2a9a40a05 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 96e2a9a40a05716a444dc217629374c387efd159 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 16:17:28 +0000 Message-Id: <6ae8b798.47706.7b3650c1@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=96e2a9a40a05716a444dc217629374c387efd159 commit 96e2a9a40a05716a444dc217629374c387efd159 Author: Kevin Bowling AuthorDate: 2026-11-02 16:17:00 +0000 Commit: Kevin Bowling CommitDate: 2026-11-02 16:17: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. MFC after: 3 days Sponsored by: BBOX.io --- 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;