From 1768514eebfa888563049fa165449a1c1eba92d8 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 7 Aug 2015 21:19:26 +0100 Subject: [PATCH] regulator: core: Reduce rdev locking region when releasing regulator When we release a regulator we need to remove references to it from the rdev which means locking the rdev. Currently we also free resources associated with the regulator inside the rdev lock but there is no need to do this, we can reduce the region the lock is held by restricting it to just actions that affect the rdev. Signed-off-by: Mark Brown --- drivers/regulator/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 62e4f3bd5783..89be8e287275 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1601,14 +1601,15 @@ static void _regulator_put(struct regulator *regulator) if (regulator->dev) sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name); mutex_lock(&rdev->mutex); - kfree(regulator->supply_name); list_del(®ulator->list); - kfree(regulator); rdev->open_count--; rdev->exclusive = 0; mutex_unlock(&rdev->mutex); + kfree(regulator->supply_name); + kfree(regulator); + module_put(rdev->owner); } -- 2.11.0