Skip to content

Commit 6fe8131

Browse files
committed
Merge tag 'i2c-for-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: - Address translator: fix wrong include - ChromeOS EC tunnel: fix potential NULL pointer dereference * tag 'i2c-for-6.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: atr: Fix wrong include i2c: cros-ec-tunnel: defer probe if parent EC is not present
2 parents fa6ad96 + 24aaced commit 6fe8131

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/i2c/busses/i2c-cros-ec-tunnel.c

+3
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,9 @@ static int ec_i2c_probe(struct platform_device *pdev)
247247
u32 remote_bus;
248248
int err;
249249

250+
if (!ec)
251+
return dev_err_probe(dev, -EPROBE_DEFER, "couldn't find parent EC device\n");
252+
250253
if (!ec->cmd_xfer) {
251254
dev_err(dev, "Missing sendrecv\n");
252255
return -EINVAL;

drivers/i2c/i2c-atr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* Originally based on i2c-mux.c
99
*/
1010

11-
#include <linux/fwnode.h>
1211
#include <linux/i2c-atr.h>
1312
#include <linux/i2c.h>
1413
#include <linux/kernel.h>
1514
#include <linux/module.h>
1615
#include <linux/mutex.h>
16+
#include <linux/property.h>
1717
#include <linux/slab.h>
1818
#include <linux/spinlock.h>
1919

0 commit comments

Comments
 (0)