From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BBFAC26A1D0; Tue, 8 Apr 2025 11:28:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744111719; cv=none; b=Fhj93UDkmqmWGfwxttpuqj+UPMM64P2xE4umMAyeWF5yH5es6lBgo7V0bcllhHrgVGVWAxvgSebxI5UOydWd+Mnj/B5KX+FaomqyEocPpnukOoonD2qlnM66s/8lC0dE2we4ikE0pYWAhyep0f8z9ySTxgR0xSgHm9CbAY8NnRY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744111719; c=relaxed/simple; bh=0ZzRNgnCk8MRzbBUHTHfzHBEITvWMrrH4SYs5b/gT+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aOTDzV82zpz21U4rYK2Svg6DcxMKbgUqWZN4s4qqamBTFNP1Da8vxf2sp0rxRNif2aakwfeR+1nk6dfBrqxpEWtOTFI+qTP8pDYgFgea6cMFMSO1eRbb/dJn+o9uOxWqN6epJb+zQwLuqQqoiTbYrAh2saRyG2LrbER9Moy8ZfY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=o4huG6qA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="o4huG6qA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE8F0C4CEE5; Tue, 8 Apr 2025 11:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744111719; bh=0ZzRNgnCk8MRzbBUHTHfzHBEITvWMrrH4SYs5b/gT+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o4huG6qACtlgEgBT+NX1yIYSZv2kJmZwZTfiO15m3cmCE8uuoEGRM2XDqx6XQ+kf4 Soxguw4AzG/8q6XbzZxR7E2AXqWUAQVMRzLbxfU86hfzOmIDGk3aPfANQeFmAiYXbM WVnMEwtDR0D64efGn6wqu3y5zO6tD+DglC3SaRd8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stefan Wahren , Sasha Levin Subject: [PATCH 6.14 534/731] staging: vchiq_arm: Register debugfs after cdev Date: Tue, 8 Apr 2025 12:47:11 +0200 Message-ID: <20250408104926.699027397@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stefan Wahren [ Upstream commit 63f4dbb196db60a8536ba3d1b835d597a83f6cbb ] The commit 2a4d15a4ae98 ("staging: vchiq: Refactor vchiq cdev code") moved the debugfs directory creation before vchiq character device registration. In case the latter fails, the debugfs directory won't be cleaned up. Fixes: 2a4d15a4ae98 ("staging: vchiq: Refactor vchiq cdev code") Signed-off-by: Stefan Wahren Link: https://lore.kernel.org/r/20250309125014.37166-2-wahrenst@gmx.net Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index a4e83e5d619bc..e2e80e90b555b 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -1386,8 +1386,6 @@ static int vchiq_probe(struct platform_device *pdev) return ret; } - vchiq_debugfs_init(&mgmt->state); - dev_dbg(&pdev->dev, "arm: platform initialised - version %d (min %d)\n", VCHIQ_VERSION, VCHIQ_VERSION_MIN); @@ -1401,6 +1399,8 @@ static int vchiq_probe(struct platform_device *pdev) return ret; } + vchiq_debugfs_init(&mgmt->state); + bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio"); bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera"); -- 2.39.5