]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
pwm: Don't hold pwm_lookup_lock longer than necessary
authorHans de Goede <hdegoede@redhat.com>
Sun, 22 Jan 2017 16:14:07 +0000 (17:14 +0100)
committerThierry Reding <thierry.reding@gmail.com>
Mon, 30 Jan 2017 08:19:26 +0000 (09:19 +0100)
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>
drivers/pwm/core.c

index e3d6c5437070efcc656c9088c138ccb9971b0ab7..799c4fb4cc2faeba3770f8e743798f23c3ff5563 100644 (file)
@@ -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);