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 664262D8391; Fri, 8 May 2026 09:03:32 +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=1778231012; cv=none; b=k0fsr2xVM74gjU3LgA0+/GshZVU2IywKXaZCFYToV1xFQHcDTmGB9oaWT3PckMZ5dy6ewdUJHD4W6YKaSCBJaYEKQmBel7RvDfKBIzVKFugUF7pUtfao+QqTr/0de7EcTYO1Oosb+4b/7KOkaOSCaThjrQMXB8raa4X7D0UEdPg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778231012; c=relaxed/simple; bh=siKm5KHJA/JlSh2Msa+A6N5LZ92TKWBw13MPlkjC1dk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gzwyKj9UoFzmuw+E9wPWXxf5QvdoXs54lUJFLyp5EqcTX3zA8jfY+PhXH+DkB15Da+scYhwvsQWkNuraDsFhqh0GlAsfzLfehbzC7cvQ4Pt26cfgA/JWXXoCPEjcJxL3DuQs+vOUXuACf6Ug9Kcen3+xw6FMBsImgQi5iV7WUqI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a6i+fa10; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a6i+fa10" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FA6BC2BCB8; Fri, 8 May 2026 09:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778231012; bh=siKm5KHJA/JlSh2Msa+A6N5LZ92TKWBw13MPlkjC1dk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a6i+fa10mMooorcTB338XrM/ArerOZRqt9iWDE2c2iCrmXubtUFXEVQjoov5ORiGA KGMmpVWH5ekQDRvNLNP9qDdpSTSMQWEGsL4JakMFtypzo0zQctCag/79ZGeGPZBMEk w2MiHJCbDzzIM7sNhM6mOf+nVH+xJ5IIMFgxuJSUmipYTXcPKS4rr/RXL2JKKr4OMb FNm6Wn6Rvcjl10TmZ4r5VdL/QvgO75c7qgtzBH9PwXL5fOOv2cmLBitVBMlsmmYUo9 sxxiw4Y0Xi3t3rIcjfVFZ7sW7v/6sXDVbmsL8rz55+xOuYbEBwPCaSaQtqm7fFxidu Fh2XD4FyE2UZw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wLH7J-00000001ah6-4Axp; Fri, 08 May 2026 11:03:29 +0200 From: Johan Hovold To: Wolfram Sang Cc: Andi Shyti , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 4/9] i2c: core: fix adapter debugfs creation Date: Fri, 8 May 2026 11:03:06 +0200 Message-ID: <20260508090311.379333-5-johan@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260508090311.379333-1-johan@kernel.org> References: <20260508090311.379333-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Clients can be registered from bus notifier callbacks so the debugfs directory needs to be created before registering the adapter as clients use that directory as their debugfs parent. Move debugfs creation before adapter registration to avoid having clients create their debugfs directories in the debugfs root (which is also more likely to fail due to name collisions). Fixes: 73febd775bdb ("i2c: create debugfs entry per adapter") Cc: stable@vger.kernel.org # 6.8 Cc: Wolfram Sang Signed-off-by: Johan Hovold --- drivers/i2c/i2c-core-base.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 1caaa3b3ee10..8bf85aa2f0c2 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -1575,14 +1575,14 @@ static int i2c_register_adapter(struct i2c_adapter *adap) pm_suspend_ignore_children(&adap->dev, true); pm_runtime_enable(&adap->dev); + adap->debugfs = debugfs_create_dir(dev_name(&adap->dev), i2c_debugfs_root); + res = device_add(&adap->dev); if (res) { pr_err("adapter '%s': can't register device (%d)\n", adap->name, res); - goto err_put_adap; + goto err_remove_debugfs; } - adap->debugfs = debugfs_create_dir(dev_name(&adap->dev), i2c_debugfs_root); - res = i2c_setup_smbus_alert(adap); if (res) goto out_reg; @@ -1606,8 +1606,9 @@ static int i2c_register_adapter(struct i2c_adapter *adap) out_reg: i2c_deregister_clients(adap); - debugfs_remove_recursive(adap->debugfs); device_del(&adap->dev); +err_remove_debugfs: + debugfs_remove_recursive(adap->debugfs); err_put_adap: init_completion(&adap->dev_released); put_device(&adap->dev); -- 2.53.0