Commit 601dddb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.16-rc1' of... 

Merge tag 'regulator-fix-v6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "One minor fix for a leak in the DT parsing code in the max20086 driver"

* tag 'regulator-fix-v6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: max20086: Fix refcount leak in max20086_parse_regulators_dt()
parents f90fff1e 06118ae3

drivers/regulator/max20086-regulator.c

+3 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
// Copyright (C) 2022 Laurent Pinchart <laurent.pinchart@idesonboard.com>

// Copyright (C) 2018 Avnet, Inc.



#include <linux/cleanup.h>

#include <linux/err.h>

#include <linux/gpio/consumer.h>

#include <linux/i2c.h>
@@ -133,11 +134,11 @@ static int max20086_regulators_register(struct max20086 *chip) 
static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on)

{

	struct of_regulator_match *matches;

	struct device_node *node;

	unsigned int i;

	int ret;



	node = of_get_child_by_name(chip->dev->of_node, "regulators");

	struct device_node *node __free(device_node) =

		of_get_child_by_name(chip->dev->of_node, "regulators");

	if (!node) {

		dev_err(chip->dev, "regulators node not found\n");

		return -ENODEV;
@@ -153,7 +154,6 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) 


	ret = of_regulator_match(chip->dev, node, matches,

				 chip->info->num_outputs);

	of_node_put(node);

	if (ret < 0) {

		dev_err(chip->dev, "Failed to match regulators\n");

		return -EINVAL;