[PATCH] i2c: ocores: delete adapter before disabling controller

[PATCH] i2c: ocores: delete adapter before disabling controller

[Matthias Goergens]

i2c_del_adapter() unregisters child devices, and their removal
callbacks may perform I2C. Delete the adapter before disabling the
controller so those transactions still work.

Found by Sashiko AI review.

Link: https://sashiko.dev/#/patchset/20260813153155.3953577-1-ruoyuw560@gmail.com
---
 drivers/i2c/busses/i2c-ocores.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index 2d18c1035837..ff024cf5f92d 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -720,14 +720,15 @@ static int ocores_i2c_probe(struct platform_device *pdev)
 static void ocores_i2c_remove(struct platform_device *pdev)
 {
 	struct ocores_i2c *i2c = platform_get_drvdata(pdev);
-	u8 ctrl = oc_getreg(i2c, OCI2C_CONTROL);
+	u8 ctrl;
+
+	/* remove adapter & data */
+	i2c_del_adapter(&i2c->adap);
 
 	/* disable i2c logic */
+	ctrl = oc_getreg(i2c, OCI2C_CONTROL);
 	ctrl &= ~(OCI2C_CTRL_EN | OCI2C_CTRL_IEN);
 	oc_setreg(i2c, OCI2C_CONTROL, ctrl);
-
-	/* remove adapter & data */
-	i2c_del_adapter(&i2c->adap);
 }
 
 static int ocores_i2c_suspend(struct device *dev)

base-commit: d89e1d186ec9271bf78e62771779e9fc03bf0fc3
prerequisite-patch-id: 44b1c2680cb029871e123eb11eab7764a807ef24
prerequisite-patch-id: f4dfbbaaec2d208ac255451cf032c22f0e7fed2d
-- 
2.56.0

Re: [PATCH] i2c: ocores: delete adapter before disabling controller

[Andrew Lunn]

On Sat, Oct 31, 2026 at 11:32:40AM +0800, Matthias Goergens wrote:
> i2c_del_adapter() unregisters child devices, and their removal
> callbacks may perform I2C. Delete the adapter before disabling the
> controller so those transactions still work.
> 
> Found by Sashiko AI review.
> 
> Link: https://sashiko.dev/#/patchset/20260813153155.3953577-1-ruoyuw560@gmail.com

Please take a read of:

https://docs.kernel.org/process/submitting-patches.html

This patch needs a Signed-off-by:

     Andrew