Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5613379 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

parents eaa27f34 83b0302d

drivers/regulator/core.c

+3 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,7 @@ struct regulator *regulator_get_optional(struct device *dev, const char *id) 
}

EXPORT_SYMBOL_GPL(regulator_get_optional);



/* Locks held by regulator_put() */

/* regulator_list_mutex lock held by regulator_put() */

static void _regulator_put(struct regulator *regulator)

{

	struct regulator_dev *rdev;
@@ -1503,12 +1503,14 @@ static void _regulator_put(struct regulator *regulator) 
	/* remove any sysfs entries */

	if (regulator->dev)

		sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name);

	mutex_lock(&rdev->mutex);

	kfree(regulator->supply_name);

	list_del(&regulator->list);

	kfree(regulator);



	rdev->open_count--;

	rdev->exclusive = 0;

	mutex_unlock(&rdev->mutex);



	module_put(rdev->owner);

}