Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / drivers / i3c / master / dw-i3c-master.c

diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
index ef5751e91cc9eff0a9a75e663e6d408a87209070..276153e10f5a404a0453e42e37f3b4ea3896b98d 100644 (file)
--- a/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@ -1163,8 +1163,10 @@ static void dw_i3c_master_set_sir_enabled(struct dw_i3c_master *master,
                global = reg == 0xffffffff;
                reg &= ~BIT(idx);
        } else {
-               global = reg == 0;
+               bool hj_rejected = !!(readl(master->regs + DEVICE_CTRL) & DEV_CTRL_HOT_JOIN_NACK);
+
                reg |= BIT(idx);
+               global = (reg == 0xffffffff) && hj_rejected;
        }
        writel(reg, master->regs + IBI_SIR_REQ_REJECT);