diff options
| author | Jonathan Richardson <jonathar@broadcom.com> | 2015-10-16 17:40:58 -0700 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2015-11-10 13:06:16 +0100 |
| commit | d1cd21427747f15920cd726f5f67a07880e7dee4 (patch) | |
| tree | 429e8844a75def440f47479f751e60f9ff685f0c /include/linux/pwm.h | |
| parent | f080be27d7d9333e4815655a2cedab91c3aa7acc (diff) | |
| download | op-kernel-dev-d1cd21427747f15920cd726f5f67a07880e7dee4.zip op-kernel-dev-d1cd21427747f15920cd726f5f67a07880e7dee4.tar.gz | |
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: Jonathan Richardson <jonathar@broadcom.com>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jonathan Richardson <jonathar@broadcom.com>
[thierry.reding@gmail.com: add missing kerneldoc for the lock]
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'include/linux/pwm.h')
| -rw-r--r-- | include/linux/pwm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index d681f68..cfc3ed4 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -2,6 +2,7 @@ #define __LINUX_PWM_H #include <linux/err.h> +#include <linux/mutex.h> #include <linux/of.h> struct pwm_device; @@ -87,6 +88,7 @@ enum { * @pwm: global index of the PWM device * @chip: PWM chip providing this 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) * @duty_cycle: duty cycle of the PWM signal (in nanoseconds) * @polarity: polarity of the PWM signal @@ -98,6 +100,7 @@ struct pwm_device { unsigned int pwm; struct pwm_chip *chip; void *chip_data; + struct mutex lock; unsigned int period; unsigned int duty_cycle; |
