Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Mar 13, 2016
2 parents 905373b + 3216523 commit c155e0a
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3913,6 +3913,16 @@ regulator_register(const struct regulator_desc *regulator_desc,
goto clean;
}

if ((config->ena_gpio || config->ena_gpio_initialized) &&
gpio_is_valid(config->ena_gpio)) {
ret = regulator_ena_gpio_request(rdev, config);
if (ret != 0) {
rdev_err(rdev, "Failed to request enable GPIO%d: %d\n",
config->ena_gpio, ret);
goto clean;
}
}

/* register with sysfs */
rdev->dev.class = &regulator_class;
rdev->dev.parent = dev;
Expand All @@ -3921,21 +3931,11 @@ regulator_register(const struct regulator_desc *regulator_desc,
ret = device_register(&rdev->dev);
if (ret != 0) {
put_device(&rdev->dev);
goto clean;
goto wash;
}

dev_set_drvdata(&rdev->dev, rdev);

if ((config->ena_gpio || config->ena_gpio_initialized) &&
gpio_is_valid(config->ena_gpio)) {
ret = regulator_ena_gpio_request(rdev, config);
if (ret != 0) {
rdev_err(rdev, "Failed to request enable GPIO%d: %d\n",
config->ena_gpio, ret);
goto wash;
}
}

/* set regulator constraints */
if (init_data)
constraints = &init_data->constraints;
Expand Down Expand Up @@ -3974,13 +3974,13 @@ regulator_register(const struct regulator_desc *regulator_desc,

scrub:
regulator_ena_gpio_free(rdev);

wash:
device_unregister(&rdev->dev);
/* device core frees rdev */
rdev = ERR_PTR(ret);
goto out;

wash:
regulator_ena_gpio_free(rdev);
clean:
kfree(rdev);
rdev = ERR_PTR(ret);
Expand Down

0 comments on commit c155e0a

Please sign in to comment.