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

torvalds · torvalds · commit 809bd2745215 · 2025-11-14T13:01:23.000-08:00
Pull regulator fix from Mark Brown:
 "One simple fix for a GPIO descriptor leak in the probe error handling
  for the fixed regulator"

* tag 'regulator-fix-v6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: fixed: fix GPIO descriptor leak on register failure
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
@@ -334,6 +334,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
 		ret = dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
 				    "Failed to register regulator: %ld\n",
 				    PTR_ERR(drvdata->dev));
+		gpiod_put(cfg.ena_gpiod);
 		return ret;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)`
`334`	`334`	`ret = dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),`
`335`	`335`	`"Failed to register regulator: %ld\n",`
`336`	`336`	`PTR_ERR(drvdata->dev));`
	`337`	`+ gpiod_put(cfg.ena_gpiod);`
`337`	`338`	`return ret;`
`338`	`339`	`}`
`339`	`340`