Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-dt-cb
Conflicts: drivers/regulator/core.c
This commit is contained in:
commit
09d3f6f161
|
@ -3586,7 +3586,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
|
|||
const struct regulation_constraints *constraints = NULL;
|
||||
const struct regulator_init_data *init_data;
|
||||
struct regulator_config *config = NULL;
|
||||
static atomic_t regulator_no = ATOMIC_INIT(0);
|
||||
static atomic_t regulator_no = ATOMIC_INIT(-1);
|
||||
struct regulator_dev *rdev;
|
||||
struct device *dev;
|
||||
int ret, i;
|
||||
|
@ -3669,8 +3669,8 @@ regulator_register(const struct regulator_desc *regulator_desc,
|
|||
/* register with sysfs */
|
||||
rdev->dev.class = ®ulator_class;
|
||||
rdev->dev.parent = dev;
|
||||
dev_set_name(&rdev->dev, "regulator.%d",
|
||||
atomic_inc_return(®ulator_no) - 1);
|
||||
dev_set_name(&rdev->dev, "regulator.%lu",
|
||||
(unsigned long) atomic_inc_return(®ulator_no));
|
||||
ret = device_register(&rdev->dev);
|
||||
if (ret != 0) {
|
||||
put_device(&rdev->dev);
|
||||
|
|
Loading…
Reference in a new issue