aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2017-01-22 17:14:07 +0100
committerThierry Reding <thierry.reding@gmail.com>2017-01-30 09:19:26 +0100
commit69efb3439ccf2ce72e01edde05d2c63d624e251e (patch)
treed7082ea34b7b89a9a6cf3aec911e1f3046c39fb9 /drivers/pwm
parentpwm: Make the PWM_POLARITY flag in DTB optional (diff)
downloadlinux-dev-69efb3439ccf2ce72e01edde05d2c63d624e251e.tar.xz
linux-dev-69efb3439ccf2ce72e01edde05d2c63d624e251e.zip
pwm: Don't hold pwm_lookup_lock longer than necessary
There is no need to hold pwm_lookup_lock after we're done with looping over pwm_lookup_list, so release it earlier. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r--drivers/pwm/core.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index e3d6c5437070..799c4fb4cc2f 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -759,9 +759,9 @@ void pwm_remove_table(struct pwm_lookup *table, size_t num)
*/
struct pwm_device *pwm_get(struct device *dev, const char *con_id)
{
- struct pwm_device *pwm = ERR_PTR(-EPROBE_DEFER);
const char *dev_id = dev ? dev_name(dev) : NULL;
- struct pwm_chip *chip = NULL;
+ struct pwm_device *pwm;
+ struct pwm_chip *chip;
unsigned int best = 0;
struct pwm_lookup *p, *chosen = NULL;
unsigned int match;
@@ -819,24 +819,22 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
}
}
- if (!chosen) {
- pwm = ERR_PTR(-ENODEV);
- goto out;
- }
+ mutex_unlock(&pwm_lookup_lock);
+
+ if (!chosen)
+ return ERR_PTR(-ENODEV);
chip = pwmchip_find_by_name(chosen->provider);
if (!chip)
- goto out;
+ return ERR_PTR(-EPROBE_DEFER);
pwm = pwm_request_from_chip(chip, chosen->index, con_id ?: dev_id);
if (IS_ERR(pwm))
- goto out;
+ return pwm;
pwm->args.period = chosen->period;
pwm->args.polarity = chosen->polarity;
-out:
- mutex_unlock(&pwm_lookup_lock);
return pwm;
}
EXPORT_SYMBOL_GPL(pwm_get);