| From 7bbf31c182f76a145126116a34bcb5355e8a17e1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 13 Jan 2026 09:26:44 +0200 |
| Subject: i3c: master: Update hot-join flag only on success |
| |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| |
| [ Upstream commit f0775157b9f9a28ae3eabc8d05b0bc52e8056c80 ] |
| |
| To prevent inconsistent state when an error occurs, ensure the hot-join |
| flag is updated only when enabling or disabling hot-join succeeds. |
| |
| Fixes: 317bacf960a48 ("i3c: master: add enable(disable) hot join in sys entry") |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> |
| Reviewed-by: Frank Li <Frank.Li@nxp.com> |
| Link: https://patch.msgid.link/20260113072702.16268-4-adrian.hunter@intel.com |
| Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 5c0cb3f38c90b..fe6f956cc3111 100644 |
| --- a/drivers/i3c/master.c |
| +++ b/drivers/i3c/master.c |
| @@ -619,7 +619,8 @@ static int i3c_set_hotjoin(struct i3c_master_controller *master, bool enable) |
| else |
| ret = master->ops->disable_hotjoin(master); |
| |
| - master->hotjoin = enable; |
| + if (!ret) |
| + master->hotjoin = enable; |
| |
| i3c_bus_normaluse_unlock(&master->bus); |
| |
| -- |
| 2.51.0 |
| |
