Merge tag 'wireless-drivers-for-davem-2019-03-19' of git://git.kernel.org/pub/scm...

[platform/kernel/linux-starfive.git] / drivers / i2c / i2c-core-of.c

diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
index 6cb7ad6..0f01cdb 100644 (file)
--- a/drivers/i2c/i2c-core-of.c
+++ b/drivers/i2c/i2c-core-of.c
@@ -121,6 +121,17 @@ static int of_dev_node_match(struct device *dev, void *data)
        return dev->of_node == data;
 }
 
+static int of_dev_or_parent_node_match(struct device *dev, void *data)
+{
+       if (dev->of_node == data)
+               return 1;
+
+       if (dev->parent)
+               return dev->parent->of_node == data;
+
+       return 0;
+}
+
 /* must call put_device() when done with returned i2c_client device */
 struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)
 {
@@ -145,7 +156,8 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
        struct device *dev;
        struct i2c_adapter *adapter;
 
-       dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match);
+       dev = bus_find_device(&i2c_bus_type, NULL, node,
+                             of_dev_or_parent_node_match);
        if (!dev)
                return NULL;