Skip to content

Commit ed36b43

Browse files
committed
Merge tag 'i2c-for-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: - omap: use correct function to read from device tree - MAINTAINERS: remove Seth from ISMT maintainership * tag 'i2c-for-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: MAINTAINERS: Remove entry for Seth Heasley i2c: omap: fix deprecated of_property_read_bool() use
2 parents 86c0195 + b6c08bc commit ed36b43

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11237,7 +11237,6 @@ S: Maintained
1123711237
F: drivers/i2c/busses/i2c-cht-wc.c
1123811238

1123911239
I2C/SMBUS ISMT DRIVER
11240-
M: Seth Heasley <seth.heasley@intel.com>
1124111240
M: Neil Horman <nhorman@tuxdriver.com>
1124211241
L: linux-i2c@vger.kernel.org
1124311242
F: Documentation/i2c/busses/i2c-ismt.rst

drivers/i2c/busses/i2c-omap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ omap_i2c_probe(struct platform_device *pdev)
14541454
(1000 * omap->speed / 8);
14551455
}
14561456

1457-
if (of_property_read_bool(node, "mux-states")) {
1457+
if (of_property_present(node, "mux-states")) {
14581458
struct mux_state *mux_state;
14591459

14601460
mux_state = devm_mux_state_get(&pdev->dev, NULL);

0 commit comments

Comments
 (0)