Commit d1cd2142 authored by Jonathan Richardson's avatar Jonathan Richardson Committed by Thierry Reding

pwm: Set enable state properly on failed call to enable

The pwm_enable() function didn't clear the enabled bit if a call to the
driver's ->enable() callback returned an error. The result was that the
state of the PWM core was wrong. Clearing the bit when enable returns
an error ensures the state is properly set.
Tested-by: default avatarJonathan Richardson <jonathar@broadcom.com>
Reviewed-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarJonathan Richardson <jonathar@broadcom.com>
[thierry.reding@gmail.com: add missing kerneldoc for the lock]
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent f080be27
...@@ -269,6 +269,7 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip, ...@@ -269,6 +269,7 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip,
pwm->pwm = chip->base + i; pwm->pwm = chip->base + i;
pwm->hwpwm = i; pwm->hwpwm = i;
pwm->polarity = polarity; pwm->polarity = polarity;
mutex_init(&pwm->lock);
radix_tree_insert(&pwm_tree, pwm->pwm, pwm); radix_tree_insert(&pwm_tree, pwm->pwm, pwm);
} }
...@@ -473,16 +474,22 @@ int pwm_set_polarity(struct pwm_device *pwm, enum pwm_polarity polarity) ...@@ -473,16 +474,22 @@ int pwm_set_polarity(struct pwm_device *pwm, enum pwm_polarity polarity)
if (!pwm->chip->ops->set_polarity) if (!pwm->chip->ops->set_polarity)
return -ENOSYS; return -ENOSYS;
if (pwm_is_enabled(pwm)) mutex_lock(&pwm->lock);
return -EBUSY;
if (pwm_is_enabled(pwm)) {
err = -EBUSY;
goto unlock;
}
err = pwm->chip->ops->set_polarity(pwm->chip, pwm, polarity); err = pwm->chip->ops->set_polarity(pwm->chip, pwm, polarity);
if (err) if (err)
return err; goto unlock;
pwm->polarity = polarity; pwm->polarity = polarity;
return 0; unlock:
mutex_unlock(&pwm->lock);
return err;
} }
EXPORT_SYMBOL_GPL(pwm_set_polarity); EXPORT_SYMBOL_GPL(pwm_set_polarity);
...@@ -494,10 +501,22 @@ EXPORT_SYMBOL_GPL(pwm_set_polarity); ...@@ -494,10 +501,22 @@ EXPORT_SYMBOL_GPL(pwm_set_polarity);
*/ */
int pwm_enable(struct pwm_device *pwm) int pwm_enable(struct pwm_device *pwm)
{ {
if (pwm && !test_and_set_bit(PWMF_ENABLED, &pwm->flags)) int err = 0;
return pwm->chip->ops->enable(pwm->chip, pwm);
if (!pwm)
return -EINVAL;
mutex_lock(&pwm->lock);
if (!test_and_set_bit(PWMF_ENABLED, &pwm->flags)) {
err = pwm->chip->ops->enable(pwm->chip, pwm);
if (err)
clear_bit(PWMF_ENABLED, &pwm->flags);
}
mutex_unlock(&pwm->lock);
return pwm ? 0 : -EINVAL; return err;
} }
EXPORT_SYMBOL_GPL(pwm_enable); EXPORT_SYMBOL_GPL(pwm_enable);
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define __LINUX_PWM_H #define __LINUX_PWM_H
#include <linux/err.h> #include <linux/err.h>
#include <linux/mutex.h>
#include <linux/of.h> #include <linux/of.h>
struct pwm_device; struct pwm_device;
...@@ -87,6 +88,7 @@ enum { ...@@ -87,6 +88,7 @@ enum {
* @pwm: global index of the PWM device * @pwm: global index of the PWM device
* @chip: PWM chip providing this PWM device * @chip: PWM chip providing this PWM device
* @chip_data: chip-private data associated with the PWM device * @chip_data: chip-private data associated with the PWM device
* @lock: used to serialize accesses to the PWM device where necessary
* @period: period of the PWM signal (in nanoseconds) * @period: period of the PWM signal (in nanoseconds)
* @duty_cycle: duty cycle of the PWM signal (in nanoseconds) * @duty_cycle: duty cycle of the PWM signal (in nanoseconds)
* @polarity: polarity of the PWM signal * @polarity: polarity of the PWM signal
...@@ -98,6 +100,7 @@ struct pwm_device { ...@@ -98,6 +100,7 @@ struct pwm_device {
unsigned int pwm; unsigned int pwm;
struct pwm_chip *chip; struct pwm_chip *chip;
void *chip_data; void *chip_data;
struct mutex lock;
unsigned int period; unsigned int period;
unsigned int duty_cycle; unsigned int duty_cycle;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment