From nobody Sun Jun 14 16:52:13 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 4gdfRx6Fymz6h2jY for ; Sun, 14 Jun 2026 16:52:13 +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 4gdfRx41chz42dG for ; Sun, 14 Jun 2026 16:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781455933; 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=2uOL13e3BQ5amha2CxwLaRrkvMQSmt59cCw6hq1MPOQ=; b=Ok9FQZ/2RhP5EVtPLnHIubhAIAiryhPnKpVgkABgUsSh7CQKMISy/byktfWI3L1OrVZTI7 cEFZZM8Mxl7v1Z0FIShfeIk0d1JehqHBS9CyU6P/h56pVF9IlUpT7WX+C3NIgk3xpbKcU5 qr8+5hyrIm4VMpbb0stQR8NbuN3hRt7Tu1cN1CkHPPeD2iioWTatU8uSFZiAV+o56T5550 LueDggfEXjI0fr81858hUfb/NlBgTFaOJ9dHgbXDzalN/SCfbaaBB0WYsl4pq0Z1B8gPuN rxmK97mhEsvkOaJ1sjVoC41XPvSHKmXL4MdISB0GGdPX+lyfd3t5Rk/TSyAiJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781455933; a=rsa-sha256; cv=none; b=XS78ibbH2xiYIiwNBDrY2Z8Lc1qqkVrFtBmztrU7fwkqs9MPuSHLfPC2dTav3bvrSN1c0q kz6jNZ8goOug1TvKGhrgRLRfBnWtn8stJc9sszA6RKy4vMLXMIDPYTJEg9Uvs4COJI7mYL kfY4Xnr2fn7muhNyEA4fXeOQfTKZiR2zvMGckUU0jofQp2O5P/cmI0Li+EFQMhO1RlVGVQ tpF5NI9m6qNipVJR1wc7ftox2g3MQP30k0aYrA7g+vjBXwliRlItcHfWb8GAUEOSWBIlIu YYXTBtiTN9IfY6PGfAsdoKhzvaSr+4Dit/8LQR9Et+Fks4HK4CwK9eSYzTg1+Q== 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=1781455933; 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=2uOL13e3BQ5amha2CxwLaRrkvMQSmt59cCw6hq1MPOQ=; b=xHCAFBGkkdmnqVazBO2lIB5bvjNMtucvsqsk4heWO4svH4GrWi1cMQrMjSGHGepllAuVnm Agw/HDMkoD+afQAV5irisN4n92hAoSnBCD0chrUFB8Xp3HQjGARjeMYmHRnqw20k73+k/v 9bJQ1Js+J8Zkb122dVp3+ZR28Z1hYdlD6ZfSWrXBS245a4o0WII9LUEwGIoWICKYbSTHat q20YOQHtIugzOp4zrd8XFKCnHpgFmKduNMVWV+eVV5+j9LNycAN7ayh4vUXQnVir/x3+aI JRoWA2qr9gdKLZCFBgir2je5/1wJb+gTRTR7OU9K5WV8wA3Wsi1y4nDv7yOCqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gdfRx3PR1z2nF for ; Sun, 14 Jun 2026 16:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 459d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 14 Jun 2026 16:52:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Haoxiang Li From: Ahmad Khalifa Subject: git: 836d0d341aa8 - main - arm/bcm2835: Release mailbox resources on attach failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 836d0d341aa84adb0d80c704203c30a0c488bc53 Auto-Submitted: auto-generated Date: Sun, 14 Jun 2026 16:52:13 +0000 Message-Id: <6a2edc3d.459d6.7799bce1@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=836d0d341aa84adb0d80c704203c30a0c488bc53 commit 836d0d341aa84adb0d80c704203c30a0c488bc53 Author: Haoxiang Li AuthorDate: 2026-06-09 08:37:06 +0000 Commit: Ahmad Khalifa CommitDate: 2026-06-14 16:51:04 +0000 arm/bcm2835: Release mailbox resources on attach failure Also remove the rid variable since it was unused. Signed-off-by: Haoxiang Li Reviewed-by: vexeduxr Pull-Request: https://github.com/freebsd/freebsd-src/pull/2255 --- sys/arm/broadcom/bcm2835/bcm2835_mbox.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c index a3a3744ce43c..c91647deae44 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c @@ -161,9 +161,8 @@ bcm_mbox_attach(device_t dev) { struct bcm_mbox_softc *sc = device_get_softc(dev); int i; - int rid = 0; - sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, 0, RF_ACTIVE); if (sc->mem_res == NULL) { device_printf(dev, "could not allocate memory resource\n"); return (ENXIO); @@ -172,19 +171,17 @@ bcm_mbox_attach(device_t dev) sc->bst = rman_get_bustag(sc->mem_res); sc->bsh = rman_get_bushandle(sc->mem_res); - rid = 0; - sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, 0, RF_ACTIVE); if (sc->irq_res == NULL) { device_printf(dev, "could not allocate interrupt resource\n"); - return (ENXIO); + goto fail_mem; } /* Setup and enable the timer */ - if (bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE | INTR_TYPE_MISC, + if (bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE | INTR_TYPE_MISC, NULL, bcm_mbox_intr, sc, &sc->intr_hl) != 0) { - bus_release_resource(dev, SYS_RES_IRQ, rid, sc->irq_res); device_printf(dev, "Unable to setup the clock irq handler.\n"); - return (ENXIO); + goto fail_irq; } mtx_init(&sc->lock, "vcio mbox", NULL, MTX_DEF); @@ -202,6 +199,14 @@ bcm_mbox_attach(device_t dev) mbox_write_4(sc, REG_CONFIG, CONFIG_DATA_IRQ); return (0); + +fail_irq: + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); + sc->irq_res = NULL; +fail_mem: + bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res); + sc->mem_res = NULL; + return (ENXIO); } /*