summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2025-05-10 11:41:13 +0200
committerWolfram Sang <wsa+renesas@sang-engineering.com>2025-05-10 11:41:13 +0200
commitb6c08bcddb2af9ea6d1846bcd36a35371e249003 (patch)
treeb533a327494fc6e2a3c73a93248c58d26c4c56a8
parent92a09c47464d040866cf2b4cd052bc60555185fb (diff)
parent10aba126bc86904e2f5afeaa26354e877a593c95 (diff)
Merge tag 'i2c-host-fixes-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
i2c-host-fixes for v6.15-rc6 - omap: use correct function to read from device tree - MAINTAINERS: remove Seth from ISMT maintainership
-rw-r--r--MAINTAINERS1
-rw-r--r--drivers/i2c/busses/i2c-omap.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 69511c3b2b76..70229ed0c55a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11235,7 +11235,6 @@ S: Maintained
F: drivers/i2c/busses/i2c-cht-wc.c
I2C/SMBUS ISMT DRIVER
-M: Seth Heasley <seth.heasley@intel.com>
M: Neil Horman <nhorman@tuxdriver.com>
L: linux-i2c@vger.kernel.org
F: Documentation/i2c/busses/i2c-ismt.rst
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 16afb9ca19bb..876791d20ed5 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1454,7 +1454,7 @@ omap_i2c_probe(struct platform_device *pdev)
(1000 * omap->speed / 8);
}
- if (of_property_read_bool(node, "mux-states")) {
+ if (of_property_present(node, "mux-states")) {
struct mux_state *mux_state;
mux_state = devm_mux_state_get(&pdev->dev, NULL);