From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D3ACC3B2D00; Tue, 21 Jul 2026 21:07:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668045; cv=none; b=MxNUvuc/T7E2MD4tCdDNFJImd7/ZWETjJMc9u2qyX8n2TF5gTMpTHYe2jt91TvjiJl8Jx8R8GCmW4kOgVjoiJmU/OYpz/quBDD8YRnoyPemPJxOYONgul3ayRdAgKKqRgxtGfTEBG7kAxFermkee8ikC3w318s1a76VADH+hWpo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668045; c=relaxed/simple; bh=9YGN9fqeFyQd70Jxaa1eTyHyAYjMszkblTBtImzsDd0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e13zgPWmWO+pHGdnb9Yu+B5vUqgqLwSY9nxR2IJwAwf+bJnbEFBnDQ4RyzIFKFdYxHRwK6hndca1SWKfaC48aHlL0/JfU2EqtiGwdxBZJkh/dloiy9WIhFpaFT2u64hhUqzbqMMQRAFBkeWjWiCbTwb5wdjZqm5kvo6sKD32Uxw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=om9wnbBO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="om9wnbBO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 454A31F000E9; Tue, 21 Jul 2026 21:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784668044; bh=VwP0wItLTrtgHNb1q8TnOYsu3+Rlz/2PQICe6HxRRJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=om9wnbBOlMOiORf5v5vOd08IDB5siKsBPgTc6VW6jtOMdvbWCsOG7DyMmRiL7lC81 xV8505jb9fdd9NmBTV8Siixe5Iy4ayct+mttbk29K6OD3Pa9Bm2YxMsWlzy5f0nRZ2 c9gFECI1K3FPABkQxTgyZfTIR0FSuJQkJ9Xm0Nvk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wolfram Sang , Johan Hovold , Sasha Levin Subject: [PATCH 6.1 0027/1067] i2c: core: fix adapter debugfs creation Date: Tue, 21 Jul 2026 17:10:28 +0200 Message-ID: <20260721152425.149296424@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold [ Upstream commit 07d5fb537928aad4369aaff0cbae73ba38a719af ] 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). Note that failure to allocate the adapter name must now be handled explicitly as debugfs_create_dir() cannot handle a NULL name (unlike device_add() which returns an error). Fixes: 73febd775bdb ("i2c: create debugfs entry per adapter") Cc: stable@vger.kernel.org # 6.8 Cc: Wolfram Sang Signed-off-by: Johan Hovold Signed-off-by: Wolfram Sang Stable-dep-of: ba14d7cf2fe7 ("i2c: core: fix adapter registration race") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/i2c-core-base.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -1551,17 +1551,22 @@ static int i2c_register_adapter(struct i goto out_list; } - dev_set_name(&adap->dev, "i2c-%d", adap->nr); + res = dev_set_name(&adap->dev, "i2c-%d", adap->nr); + if (res) + goto err_remove_irq_domain; + adap->dev.bus = &i2c_bus_type; adap->dev.type = &i2c_adapter_type; - res = device_register(&adap->dev); + device_initialize(&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; @@ -1602,13 +1607,13 @@ static int i2c_register_adapter(struct i out_reg: i2c_deregister_clients(adap); - debugfs_remove_recursive(adap->debugfs); device_del(&adap->dev); -err_put_adap: +err_remove_debugfs: + debugfs_remove_recursive(adap->debugfs); init_completion(&adap->dev_released); put_device(&adap->dev); wait_for_completion(&adap->dev_released); - +err_remove_irq_domain: i2c_host_notify_irq_teardown(adap); out_list: mutex_lock(&core_lock);