From nobody Wed May 27 18:22:57 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 4gQdK23qFyz6fSBp for ; Wed, 27 May 2026 18:23:02 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQdK237NRz429w for ; Wed, 27 May 2026 18:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779906182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgVy7dIB6Dlp1CVZj3HtQ4Y2Vyn76uvb49neURyhF88=; b=ps2bw32NuFPssyElMrOzXQEZdKbM7QRw2lryNv4/aG3hrGGdEw7YmIdY4+5e2ZLtjNBZhe gUS1nQ2/RSZJE4Y97rY3R7Gne1eSu+qrRDMOiGetxmPqP4aitW/ijUDCItcIkNgRWoWiv2 1M7Y/I7UxNzt/XWni7U651VT/YUUFFkV0jP0OaFM8YkErtVu6f+zjiF+WOK/2/E+muOLZ+ Qa2aBCsR+rV+2AXPXuBC38Xp/AGPTtboY8SmCoFKLfNnkjvYxCvCYeKEPAXxJRUMGllGOp /ZkpeQUkaPXJ2q807Bepckc1LMYi9ixw7Zc0HlFqpBn8hUilDjkTqLUiMzwb5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779906182; a=rsa-sha256; cv=none; b=DYixUEIc9v/MIXSW5GHafFHZrLRBMNl8fQzCJClM6VLiyQaLkndn9/SKLVtDtdk2tgUSQ8 IQPLmBA1Bpm4Ogx2YtJvV5mn72PWZGLIMx9kTcP0mYR3F/Kxjx6tGXhRlgStoiX5gIFKO8 fEVrh57CvdCCyFcvhLk2m8WLcR896oCMJ+NBGovZ/tAPRipL4AtT00YVcm7oer+LHpEMwx TJQ5d2DgNX/aJIKo930E9JhTPJld2qTiyu3kCfkWP/DDb16olLmCdvJbzHGwY1Eqt2G3m1 LG/1CnJVZPl75HtL0lljRbY8A+xvaHpN7bsIiLLYYRw9+Wp8gGngVHKfGFiMMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779906182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RgVy7dIB6Dlp1CVZj3HtQ4Y2Vyn76uvb49neURyhF88=; b=MXXeTfF/j7Dztn51qwxTAmSqmU/4hgdjWFgEq2RCVsd4FNZBQdLP1ip4CCpoLMd9lm78qj fTMK6SYQDpP3pzmHEHZtF+bK/WoXmSuSubZrcMRa2jJ0YqVn7WcTFZAxe77sb8vEemIfH9 aUtQ9SStdIrRCVngPd3QM2kIOTJbi+8sWcolvIVqXLXIJWdqDLxJrhdLKFnxjK9JuPAXFk rt20vn7tyQiW0fyBdSEKlxVMNYF8Qjv92F+WFriwm/IO0C/Psgyn0Slo/KT40yJKisCFeH s+B1rajFVFlGKvI6hI+Tdi4OeO7YQVNZS6nohzaGrhzOJHiLvmUqT6W1EtZdlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQdK22ZC9z19jK for ; Wed, 27 May 2026 18:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 410bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 18:22:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Haoxiang Li From: Mitchell Horne Subject: git: d1488cd762be - main - bcm2835_sdhci: Clean up DMA resources on attach failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1488cd762bee79240a715bf04f3d30e9a121b26 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 18:22:57 +0000 Message-Id: <6a173681.410bc.778c744e@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d1488cd762bee79240a715bf04f3d30e9a121b26 commit d1488cd762bee79240a715bf04f3d30e9a121b26 Author: Haoxiang Li AuthorDate: 2026-05-27 02:42:43 +0000 Commit: Mitchell Horne CommitDate: 2026-05-27 18:12:09 +0000 bcm2835_sdhci: Clean up DMA resources on attach failure bcm_sdhci_attach() allocates a DMA channel with bcm_dma_allocate() before creating the bus_dma tag and map. If a later initialization step fails, the common error path releases the interrupt and memory resources, but leaves the DMA channel allocated. Call bcm_dma_free() for cleanup, as it already performs the required internal checks and can therefore be invoked directly. Signed-off-by: Haoxiang Li Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2241 --- sys/arm/broadcom/bcm2835/bcm2835_sdhci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c index e0c4327d8e05..6e974a1a61bb 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c @@ -365,6 +365,7 @@ bcm_sdhci_attach(device_t dev) return (0); fail: + bcm_dma_free(sc->sc_dma_ch); if (sc->sc_intrhand) bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intrhand); if (sc->sc_irq_res)