summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndi Shyti <andi.shyti@kernel.org>2026-08-28 03:13:31 +0200
committerAndi Shyti <andi.shyti@kernel.org>2026-08-28 03:13:31 +0200
commitb68b2b3f8ba86b9934c86451c6ea0ffe655c6c4e (patch)
treec75e5278413f1a96498c8bf3db9d1a178204066b /drivers
parent37c12dc88c75275236e9039ac4fe14a28e89d371 (diff)
parentb15b548d52b43ba8ac4652bc2c7244a8dd1e9622 (diff)
downloadlinux-next-b68b2b3f8ba86b9934c86451c6ea0ffe655c6c4e.tar.gz
linux-next-b68b2b3f8ba86b9934c86451c6ea0ffe655c6c4e.zip
Merge branch 'i2c/i2c-fixes' into i2c/i2c-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/i2c-core-base.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index fb25704219c7..ddaacf876dad 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1816,6 +1816,12 @@ void i2c_del_adapter(struct i2c_adapter *adap)
return;
}
+ /*
+ * This drains any in-flight writers, so all
+ * clients will be caught by i2c_deregister_clients().
+ */
+ device_remove_file(&adap->dev, &dev_attr_new_device);
+
i2c_acpi_remove_space_handler(adap);
i2c_deregister_clients(adap);