regulator: Improve virtual consumer probe error handling
PATCH 1/1 regulator: Improve virtual consumer probe error handling
Report errors to the user and try harder to clean up if we're not able to probe.
Signed-off-by Mark Brown <[email protected]>
--- drivers/regulator/virtual.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
drivers/regulator/virtual.c +9 -4
@@ -286,8 +286,7 @@ static int regulator_virtual_consumer_probe(struct platform_device *pdev) drvdata =kzalloc (sizeof (struct virtual_consumer_data ),GFP_KERNEL );if (drvdata ==NULL ) { - ret = -ENOMEM ; - goto err; +return -ENOMEM ; }mutex_init (&drvdata->lock);
@@ -295,13 +294,17 @@ static int regulator_virtual_consumer_probe(struct platform_device *pdev) drvdata->regulator =regulator_get (&pdev->dev, reg_id);if (IS_ERR (drvdata->regulator)) { ret =PTR_ERR (drvdata->regulator); +dev_err (&pdev->dev,"Failed to get %s: %d\n" , reg_id, ret); goto err; }for (i =0 ; i <ARRAY_SIZE (attributes); i++) { ret =device_create_file (&pdev->dev, attributes[i]); -if (ret !=0 ) - goto err; +if (ret !=0 ) { +dev_err (&pdev->dev,"Failed to create attr %d: %d\n" , + i, ret); + goto err_regulator; + } } drvdata->mode =regulator_get_mode (drvdata->regulator);
@@ -310,6 +313,8 @@ static int regulator_virtual_consumer_probe(struct platform_device *pdev)return 0 ; +err_regulator: +regulator_put (drvdata->regulator); err:for (i =0 ; i <ARRAY_SIZE (attributes); i++)device_remove_file (&pdev->dev, attributes[i]);
Signature · 1 line
1.6.3.3