hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regulator: gpio: Fix some error handling paths in 'gpio_regulator_probe()' 

Re-order error handling code and gotos to avoid leaks in error handling
paths.

Fixes: 9f946099fe ("regulator: gpio: fix parsing of gpio list")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Christophe Jaillet 2018-03-13 21:33:11 +01:00 committed by Mark Brown
parent 11da04af0d
commit ed8cffda27
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/regulator/gpio-regulator.c
View File

@ -271,8 +271,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL); drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL);
if (drvdata->desc.name == NULL) { if (drvdata->desc.name == NULL) {
dev_err(&pdev->dev, "Failed to allocate supply name\n"); dev_err(&pdev->dev, "Failed to allocate supply name\n");
ret = -ENOMEM; return -ENOMEM;
goto err;
} }
if (config->nr_gpios != 0) { if (config->nr_gpios != 0) {
@ -292,7 +291,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Could not obtain regulator setting GPIOs: %d\n", "Could not obtain regulator setting GPIOs: %d\n",
ret); ret);
goto err_memstate; goto err_memgpio;
} }
} }
@ -303,7 +302,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
if (drvdata->states == NULL) { if (drvdata->states == NULL) {
dev_err(&pdev->dev, "Failed to allocate state data\n"); dev_err(&pdev->dev, "Failed to allocate state data\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_memgpio; goto err_stategpio;
} }
drvdata->nr_states = config->nr_states; drvdata->nr_states = config->nr_states;
@ -324,7 +323,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
default: default:
dev_err(&pdev->dev, "No regulator type set\n"); dev_err(&pdev->dev, "No regulator type set\n");
ret = -EINVAL; ret = -EINVAL;
goto err_memgpio; goto err_memstate;
} }
/* build initial state from gpio init data. */ /* build initial state from gpio init data. */
@ -361,22 +360,21 @@ static int gpio_regulator_probe(struct platform_device *pdev)
if (IS_ERR(drvdata->dev)) { if (IS_ERR(drvdata->dev)) {
ret = PTR_ERR(drvdata->dev); ret = PTR_ERR(drvdata->dev);
dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
goto err_stategpio; goto err_memstate;
} }
platform_set_drvdata(pdev, drvdata); platform_set_drvdata(pdev, drvdata);
return 0; return 0;
err_stategpio:
gpio_free_array(drvdata->gpios, drvdata->nr_gpios);
err_memstate: err_memstate:
kfree(drvdata->states); kfree(drvdata->states);
err_stategpio:
gpio_free_array(drvdata->gpios, drvdata->nr_gpios);
err_memgpio: err_memgpio:
kfree(drvdata->gpios); kfree(drvdata->gpios);
err_name: err_name:
kfree(drvdata->desc.name); kfree(drvdata->desc.name);
err:
return ret; return ret;
} }