]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
i3c: master: dw-i3c: Fix missing reset assertion in remove() callback
authorFelix Gu <ustc.gu@gmail.com>
Fri, 20 Mar 2026 14:18:02 +0000 (22:18 +0800)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Sun, 12 Apr 2026 14:37:17 +0000 (16:37 +0200)
The reset line acquired during probe is currently left deasserted when
the driver is unbound.

Switch to devm_reset_control_get_optional_exclusive_deasserted() to
ensure the reset is automatically re-asserted by the devres core when
the driver is removed.

Fixes: 62fe9d06f570 ("i3c: dw: Add power management support")
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260320-dw-i3c-v3-1-477040c2e3f5@gmail.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/i3c/master/dw-i3c-master.c

index d6bdb32397fb92fa546967587e3feaa8ec40af9f..3379cb16eeca56f6cc20dd7ed6d90c8b4838ed78 100644 (file)
@@ -1606,13 +1606,11 @@ int dw_i3c_common_probe(struct dw_i3c_master *master,
        if (IS_ERR(master->pclk))
                return PTR_ERR(master->pclk);
 
-       master->core_rst = devm_reset_control_get_optional_exclusive(&pdev->dev,
-                                                                   "core_rst");
+       master->core_rst = devm_reset_control_get_optional_exclusive_deasserted(&pdev->dev,
+                                                                               "core_rst");
        if (IS_ERR(master->core_rst))
                return PTR_ERR(master->core_rst);
 
-       reset_control_deassert(master->core_rst);
-
        spin_lock_init(&master->xferqueue.lock);
        INIT_LIST_HEAD(&master->xferqueue.list);
 
@@ -1624,7 +1622,7 @@ int dw_i3c_common_probe(struct dw_i3c_master *master,
                               dw_i3c_master_irq_handler, 0,
                               dev_name(&pdev->dev), master);
        if (ret)
-               goto err_assert_rst;
+               return ret;
 
        platform_set_drvdata(pdev, master);
 
@@ -1673,9 +1671,6 @@ err_disable_pm:
        pm_runtime_set_suspended(&pdev->dev);
        pm_runtime_dont_use_autosuspend(&pdev->dev);
 
-err_assert_rst:
-       reset_control_assert(master->core_rst);
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(dw_i3c_common_probe);