]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
i2c: core: Check for error pointer for fwnode
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 12 Jan 2026 13:22:40 +0000 (14:22 +0100)
committerWolfram Sang <wsa+renesas@sang-engineering.com>
Wed, 14 Jan 2026 07:02:20 +0000 (08:02 +0100)
Theoretically it's possible that fwnode is returned by some API,
that may return an error pointer (and we have, for example,
fwnode_find_reference() which does that). If such an fwnode
is supplied to the i2c core APIs the functions will perform
unneeded loops and checks. Avoid this by preventively checking
for an error pointer and bail out immediately.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
drivers/i2c/i2c-core-base.c

index ae7e9c8b65a65c415f5a42f0eb0e7a4ff3e86dce..41c2e46ffb2416f05310af9aa3105647aa9af1a5 100644 (file)
@@ -1090,7 +1090,7 @@ struct i2c_client *i2c_find_device_by_fwnode(struct fwnode_handle *fwnode)
        struct i2c_client *client;
        struct device *dev;
 
-       if (!fwnode)
+       if (IS_ERR_OR_NULL(fwnode))
                return NULL;
 
        dev = bus_find_device_by_fwnode(&i2c_bus_type, fwnode);
@@ -1875,7 +1875,7 @@ struct i2c_adapter *i2c_find_adapter_by_fwnode(struct fwnode_handle *fwnode)
        struct i2c_adapter *adapter;
        struct device *dev;
 
-       if (!fwnode)
+       if (IS_ERR_OR_NULL(fwnode))
                return NULL;
 
        dev = bus_find_device(&i2c_bus_type, NULL, fwnode,