Commit 6fe81317 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fa6ad96d 24aaced7

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

+3 −0
Original line number Diff line number Diff line
@@ -247,6 +247,9 @@ static int ec_i2c_probe(struct platform_device *pdev) 
	u32 remote_bus;

	int err;



	if (!ec)

		return dev_err_probe(dev, -EPROBE_DEFER, "couldn't find parent EC device\n");



	if (!ec->cmd_xfer) {

		dev_err(dev, "Missing sendrecv\n");

		return -EINVAL;

drivers/i2c/i2c-atr.c

+1 −1
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 
 * Originally based on i2c-mux.c

 */



#include <linux/fwnode.h>

#include <linux/i2c-atr.h>

#include <linux/i2c.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/property.h>

#include <linux/slab.h>

#include <linux/spinlock.h>