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 48AEB24677D; Wed, 25 Feb 2026 01:42:34 +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=1771983754; cv=none; b=Vcq1IIW6jdFI+t2XMfzllGKZUbuparwo+N03zmoOo3CYzHNf/EtpHhJjqpOrS1HNyZjjNu+82Eo6lhQ5kyifcHfdfEVq+95JlSv8EHdoVIRzkCaP8ISHrYqPia32oIp1Mn/dl3DhrytbC+auTFoQT3XvA/vmbv5xsHjUEafrxyg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983754; c=relaxed/simple; bh=u6aER71t1ksAxcPNRKrRrc2lB+xGDQ8VMq93YfzYaJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=skwU6KiUyD7H+WXJFbe69msegYYsguzFvfgz+WB8xInAzEcRaaibWsDvaXMRroevUNTZV0IPqw6I0MXSXv+FQnkr12RxpFGpMNzFDwIXfyt+ABya2IEeHHVyHIzmbpk5BjRRQmonozn2YY4Yvnut+vELiJapWSVr1l9SCp2imc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Tg8I7Mis; 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="Tg8I7Mis" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09741C2BC9E; Wed, 25 Feb 2026 01:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771983754; bh=u6aER71t1ksAxcPNRKrRrc2lB+xGDQ8VMq93YfzYaJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tg8I7MistYUCIziU9tflzIE2L3WXlG5kJSRlbp7go4Rs/OZV9qDraO+EC5aSRCh2x yRQIkhRA+9CsVrmw/3DOS5PnS0Hr2mRQSlCQMwOuuyt2m7tHvgD7QT3J7LCFqKMaEz 1NCPq9ne/+W+2xKkpMlfEY6Ldsf1TOjB2aW4Ce4U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Billy Tsai , Frank Li , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.18 008/641] i3c: Move device name assignment after i3c_bus_init Date: Tue, 24 Feb 2026 17:15:34 -0800 Message-ID: <20260225012349.142850146@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012348.915798704@linuxfoundation.org> References: <20260225012348.915798704@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Billy Tsai [ Upstream commit 3502cea99c7ceb331458cbd34ef6792c83144687 ] Move device name initialization to occur after i3c_bus_init() so that i3cbus->id is guaranteed to be assigned before it is used. Fixes: 9d4f219807d5 ("i3c: fix refcount inconsistency in i3c_master_register") Signed-off-by: Billy Tsai Reviewed-by: Frank Li Link: https://patch.msgid.link/20260112-upstream_i3c_fix-v1-1-cbbf2cb71809@aspeedtech.com Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/i3c/master.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c index 66513a27e6e77..bc68a5e7455be 100644 --- a/drivers/i3c/master.c +++ b/drivers/i3c/master.c @@ -2884,7 +2884,6 @@ int i3c_master_register(struct i3c_master_controller *master, INIT_LIST_HEAD(&master->boardinfo.i3c); device_initialize(&master->dev); - dev_set_name(&master->dev, "i3c-%d", i3cbus->id); master->dev.dma_mask = parent->dma_mask; master->dev.coherent_dma_mask = parent->coherent_dma_mask; @@ -2894,6 +2893,8 @@ int i3c_master_register(struct i3c_master_controller *master, if (ret) goto err_put_dev; + dev_set_name(&master->dev, "i3c-%d", i3cbus->id); + ret = of_populate_i3c_bus(master); if (ret) goto err_put_dev; -- 2.51.0