github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i2c-for-6.15-rc3

Browse Source 
- Address translator: fix wrong include
 - ChromeOS EC tunnel: fix potential NULL pointer dereference
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAmgEC3sACgkQFA3kzBSg
 KbaTkBAAkxZUA+WCD/BU1ZZwX2izKIH3Ed8O3VMs5BAU5ctKk1vSHKwVLA7maHIS
 MNmjRfaCdMVO6isZvLxVsUGfYSsg/cfqQzWeNvxP/vj3pp/HxvMDqtYi3omMbwac
 rg4H+CHdsJEkg8XtgyLw18TfU6QBBH1dzA17FqwA99fq2gFq1RCujTbP2Fzo14gl
 xbQOIDDiWoe66vbD1mHHjLUpJ6YgiXDfYXT3gS5rYMM8JYdI2AI3Z0N0WNdVY+Q5
 2tE4HIc5y9hRQn5bZgQ1pIO3sRBuyZTEjh1wojrSkbTZ7kqBteW71pbzyLlZXiMS
 ALijSlqe7hVozyO86fysyYXZSXFVF5U047PHq93vuIDb95PrmOpoupE57kDN5FKW
 AmOOzutWUcwTZjSWdIsdRhBFbr4tIhC/3O/o9GfsIe+dM21tzUEY4qLZnSI0FcpH
 n+g3Q0R04ys3saCLtEdr9lPM+pQgBUQ2wYLi2jZn9N1qK+DNr+r+8BRomWVt15CW
 680/ugkpGBHPW9EwzAeTGSOp6Q9gft4PmtiHDeCMcUx7vYV1Ip4xmdBn0G43bCvK
 JphLiTW80X92B0+XIbqU+Zbww0dF0f5f3MSsPfvkCK8EcMafFkbP3cX0XZt1K1fv
 JDlrIedWe5O4xTs19wIx2QUzuIoyM90RvWSpMLtH2Be+5Xdh5u0=
 =GOZq
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-04-19 13:59:04 -07:00
commit 6fe8131757
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/i2c/busses/i2c-cros-ec-tunnel.c
View File

@ -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;

2
drivers/i2c/i2c-atr.c
View File

@ -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>