Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3311469 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Wolfram Sang
Browse files

i2c: fix leaked device refcount on of_find_i2c_* error path 



If of_find_i2c_device_by_node() or of_find_i2c_adapter_by_node() find
a device by node, but its type does not match, a reference to that
device is still held. This change fixes the problem.

Signed-off-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent e952849a

drivers/i2c/i2c-core.c

+14 −6
Original line number Diff line number Diff line
@@ -1340,13 +1340,17 @@ static int of_dev_node_match(struct device *dev, void *data) 
struct i2c_client *of_find_i2c_device_by_node(struct device_node *node)

{

	struct device *dev;

	struct i2c_client *client;



	dev = bus_find_device(&i2c_bus_type, NULL, node,

					 of_dev_node_match);

	dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match);

	if (!dev)

		return NULL;



	return i2c_verify_client(dev);

	client = i2c_verify_client(dev);

	if (!client)

		put_device(dev);



	return client;

}

EXPORT_SYMBOL(of_find_i2c_device_by_node);
@@ -1354,13 +1358,17 @@ EXPORT_SYMBOL(of_find_i2c_device_by_node); 
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_node_match);

	if (!dev)

		return NULL;



	return i2c_verify_adapter(dev);

	adapter = i2c_verify_adapter(dev);

	if (!adapter)

		put_device(dev);



	return adapter;

}

EXPORT_SYMBOL(of_find_i2c_adapter_by_node);

#else