From: Jonathan Richardson <jonathar@broadcom.com> To: Tim Kryger <tim.kryger@gmail.com> Cc: Scott Branden <sbranden@broadcom.com>, Arun Ramamurthy <arun.ramamurthy@broadcom.com>, Thierry Reding <thierry.reding@gmail.com>, Ray Jui <rjui@broadcom.com>, <bcm-kernel-feedback-list@broadcom.com>, <linux-kernel@vger.kernel.org>, <linux-pwm@vger.kernel.org>, "Jonathan Richardson" <jonathar@broadcom.com> Subject: [PATCH v5 2/2] pwm: core: Set enable state properly on failed call to enable Date: Wed, 7 Jan 2015 11:42:51 -0800 [thread overview] Message-ID: <1420659771-31401-3-git-send-email-jonathar@broadcom.com> (raw) In-Reply-To: <1420659771-31401-1-git-send-email-jonathar@broadcom.com> The pwm_enable function didn't clear the enabled bit if a call to a clients enable function 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> Signed-off-by: Jonathan Richardson <jonathar@broadcom.com> --- drivers/pwm/core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index f28c4ce..c33e24f 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -477,8 +477,14 @@ EXPORT_SYMBOL_GPL(pwm_set_polarity); */ int pwm_enable(struct pwm_device *pwm) { - if (pwm && !test_and_set_bit(PWMF_ENABLED, &pwm->flags)) - return pwm->chip->ops->enable(pwm->chip, pwm); + int err; + + if (pwm && !test_and_set_bit(PWMF_ENABLED, &pwm->flags)) { + err = pwm->chip->ops->enable(pwm->chip, pwm); + if (err) + clear_bit(PWMF_ENABLED, &pwm->flags); + return err; + } return pwm ? 0 : -EINVAL; } -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Richardson <jonathar@broadcom.com> To: Tim Kryger <tim.kryger@gmail.com> Cc: Scott Branden <sbranden@broadcom.com>, Arun Ramamurthy <arun.ramamurthy@broadcom.com>, Thierry Reding <thierry.reding@gmail.com>, Ray Jui <rjui@broadcom.com>, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, Jonathan Richardson <jonathar@broadcom.com> Subject: [PATCH v5 2/2] pwm: core: Set enable state properly on failed call to enable Date: Wed, 7 Jan 2015 11:42:51 -0800 [thread overview] Message-ID: <1420659771-31401-3-git-send-email-jonathar@broadcom.com> (raw) In-Reply-To: <1420659771-31401-1-git-send-email-jonathar@broadcom.com> The pwm_enable function didn't clear the enabled bit if a call to a clients enable function 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> Signed-off-by: Jonathan Richardson <jonathar@broadcom.com> --- drivers/pwm/core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index f28c4ce..c33e24f 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -477,8 +477,14 @@ EXPORT_SYMBOL_GPL(pwm_set_polarity); */ int pwm_enable(struct pwm_device *pwm) { - if (pwm && !test_and_set_bit(PWMF_ENABLED, &pwm->flags)) - return pwm->chip->ops->enable(pwm->chip, pwm); + int err; + + if (pwm && !test_and_set_bit(PWMF_ENABLED, &pwm->flags)) { + err = pwm->chip->ops->enable(pwm->chip, pwm); + if (err) + clear_bit(PWMF_ENABLED, &pwm->flags); + return err; + } return pwm ? 0 : -EINVAL; } -- 1.7.9.5
next prev parent reply other threads:[~2015-01-07 19:42 UTC|newest] Thread overview: 222+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <Jonathan Richardson <jonathar@broadcom.com> 2014-09-16 19:58 ` [PATCH 0/6] Add initial support for Broadcom Cygnus SoC Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` [PATCH 1/6] ARM: cygnus: Initial " Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-17 0:00 ` Mark Rutland 2014-09-17 0:00 ` Mark Rutland 2014-09-17 0:00 ` Mark Rutland 2014-09-18 23:33 ` Jonathan Richardson 2014-09-18 23:33 ` Jonathan Richardson 2014-09-18 23:33 ` Jonathan Richardson 2014-09-16 19:58 ` [PATCH 2/6] clk: Clock driver " Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-17 0:47 ` Mark Rutland 2014-09-17 0:47 ` Mark Rutland 2014-09-17 0:47 ` Mark Rutland 2014-09-18 23:43 ` Jonathan Richardson 2014-09-18 23:43 ` Jonathan Richardson 2014-09-18 23:43 ` Jonathan Richardson 2014-09-16 19:58 ` [PATCH 3/6] dt-bindings: Document Broadcom Cygnus SoC and clock driver Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` [PATCH 4/6] ARM: dts: Enable Broadcom Cygnus SoC Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` [PATCH 5/6] ARM: cygnus defconfig : Initial defconfig for " Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` [PATCH 6/6] MAINTAINERS: Entry for Cygnus/iproc arm architecture and clock drivers Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-16 19:58 ` Jonathan Richardson 2014-09-18 22:31 ` [PATCH 0/6] Add initial support for Broadcom Cygnus SoC Hauke Mehrtens 2014-09-18 22:31 ` Hauke Mehrtens 2014-09-18 22:31 ` Hauke Mehrtens 2014-09-18 22:39 ` Florian Fainelli 2014-09-18 22:39 ` Florian Fainelli 2014-09-18 22:54 ` Hauke Mehrtens 2014-09-18 22:54 ` Hauke Mehrtens 2014-09-18 22:54 ` Hauke Mehrtens 2014-09-19 0:58 ` Scott Branden 2014-09-19 0:58 ` Scott Branden 2014-09-23 21:17 ` [PATCH v2 " Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` [PATCH v2 1/6] ARM: cygnus: Initial " Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` [PATCH v2 2/6] clk: Clock driver " Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` [PATCH v2 3/6] dt-bindings: Document Broadcom Cygnus SoC and clock driver Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` [PATCH v2 4/6] ARM: dts: Enable Broadcom Cygnus SoC Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` [PATCH v2 5/6] ARM: cygnus defconfig : Initial defconfig for " Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` [PATCH v2 6/6] MAINTAINERS: Entry for Cygnus/iproc arm architecture and clock drivers Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-23 21:17 ` Jonathan Richardson 2014-09-25 21:04 ` [PATCH v2 0/6] Add initial support for Broadcom Cygnus SoC Scott Branden 2014-09-25 21:04 ` Scott Branden 2014-09-25 21:04 ` Scott Branden 2014-09-25 21:22 ` Florian Fainelli 2014-09-25 21:22 ` Florian Fainelli 2014-09-25 21:22 ` Florian Fainelli 2014-09-26 0:14 ` Florian Fainelli 2014-09-26 0:14 ` Florian Fainelli 2014-09-26 0:14 ` Florian Fainelli 2014-09-26 0:28 ` Jonathan Richardson 2014-09-26 0:28 ` Jonathan Richardson 2014-09-26 0:28 ` Jonathan Richardson 2014-09-26 0:34 ` Florian Fainelli 2014-09-26 0:34 ` Florian Fainelli 2014-09-26 0:34 ` Florian Fainelli 2014-12-11 1:07 ` [PATCH v2 1/2] pwm: kona: Fix incorrect enable, config, and disable procedures Jonathan Richardson 2014-12-11 1:07 ` Jonathan Richardson 2014-12-11 1:07 ` [PATCH v2 2/2] pwm: kona: Remove setting default smooth type and polarity for all channels Jonathan Richardson 2014-12-11 1:07 ` Jonathan Richardson 2014-12-15 7:18 ` [PATCH v2 1/2] pwm: kona: Fix incorrect enable, config, and disable procedures Tim Kryger 2014-12-16 19:36 ` Jonathan Richardson 2014-12-16 19:36 ` Jonathan Richardson 2014-12-17 18:46 ` [PATCH v3 " Jonathan Richardson 2014-12-17 18:46 ` Jonathan Richardson 2014-12-17 18:46 ` [PATCH v3 2/2] pwm: kona: Remove setting default smooth type and polarity for all channels Jonathan Richardson 2014-12-17 18:46 ` Jonathan Richardson 2014-12-20 22:38 ` [PATCH v3 1/2] pwm: kona: Fix incorrect enable, config, and disable procedures Tim Kryger 2014-12-22 22:49 ` Jonathan Richardson 2014-12-22 22:49 ` Jonathan Richardson 2014-12-18 1:59 ` [PATCH 0/2] Add support for Broadcom iProc touchscreen Jonathan Richardson 2014-12-18 1:59 ` Jonathan Richardson 2014-12-18 1:59 ` Jonathan Richardson 2014-12-18 1:59 ` [PATCH 1/2] Input: touchscreen-iproc: Add Broadcom iProc touchscreen driver Jonathan Richardson 2014-12-18 1:59 ` Jonathan Richardson 2014-12-18 1:59 ` Jonathan Richardson 2014-12-18 2:14 ` Joe Perches 2014-12-18 2:14 ` Joe Perches 2014-12-19 19:51 ` Jonathan Richardson 2014-12-19 19:51 ` Jonathan Richardson 2014-12-19 19:51 ` Jonathan Richardson 2014-12-19 19:56 ` Dmitry Torokhov 2014-12-19 19:56 ` Dmitry Torokhov 2014-12-18 1:59 ` [PATCH 2/2] Input: touchscreen-iproc: add device tree bindings Jonathan Richardson 2014-12-18 1:59 ` Jonathan Richardson 2014-12-18 1:59 ` Jonathan Richardson 2014-12-19 22:17 ` [PATCH v2 0/2] Add support for Broadcom iProc touchscreen Jonathan Richardson 2014-12-19 22:17 ` Jonathan Richardson 2014-12-19 22:17 ` Jonathan Richardson 2014-12-19 22:17 ` [PATCH v2 1/2] Input: touchscreen-iproc: Add Broadcom iProc touchscreen driver Jonathan Richardson 2014-12-19 22:17 ` Jonathan Richardson 2014-12-19 22:17 ` Jonathan Richardson 2014-12-19 22:26 ` Joe Perches 2014-12-19 22:26 ` Joe Perches 2014-12-19 22:26 ` Joe Perches 2014-12-19 23:03 ` Jonathan Richardson 2014-12-19 23:03 ` Jonathan Richardson 2014-12-19 23:03 ` Jonathan Richardson 2015-01-01 0:55 ` Jonathan Richardson 2015-01-01 0:55 ` Jonathan Richardson 2015-01-01 0:55 ` Jonathan Richardson 2015-01-15 1:08 ` Florian Fainelli 2015-01-15 1:08 ` Florian Fainelli 2015-01-15 19:19 ` Jonathan Richardson 2015-01-15 19:19 ` Jonathan Richardson 2015-01-15 19:19 ` Jonathan Richardson 2015-01-15 1:02 ` Dmitry Torokhov 2015-01-15 1:02 ` Dmitry Torokhov 2015-01-15 5:44 ` Scott Branden 2015-01-15 5:44 ` Scott Branden 2015-01-15 5:44 ` Scott Branden 2015-01-15 6:07 ` Dmitry Torokhov 2015-01-15 6:07 ` Dmitry Torokhov 2015-01-15 19:51 ` Jonathan Richardson 2015-01-15 19:51 ` Jonathan Richardson 2015-01-15 19:51 ` Jonathan Richardson 2015-02-11 18:45 ` Jonathan Richardson 2015-02-11 18:45 ` Jonathan Richardson 2015-02-11 18:45 ` Jonathan Richardson 2015-02-24 23:18 ` Dmitry Torokhov 2015-02-24 23:18 ` Dmitry Torokhov 2015-02-24 23:18 ` Dmitry Torokhov 2015-02-27 1:02 ` Jonathan Richardson 2015-02-27 1:02 ` Jonathan Richardson 2015-02-27 1:02 ` Jonathan Richardson 2015-02-24 23:29 ` Dmitry Torokhov 2015-02-24 23:29 ` Dmitry Torokhov 2015-02-24 23:29 ` Dmitry Torokhov 2015-03-02 19:13 ` Jonathan Richardson 2015-03-02 19:13 ` Jonathan Richardson 2015-03-02 19:13 ` Jonathan Richardson 2014-12-19 22:17 ` [PATCH v2 2/2] Input: touchscreen-iproc: add device tree bindings Jonathan Richardson 2014-12-19 22:17 ` Jonathan Richardson 2014-12-19 22:17 ` Jonathan Richardson 2014-12-30 22:43 ` [PATCH v4 0/3] Fix bugs in kona pwm driver and pwm core Jonathan Richardson 2014-12-30 22:43 ` Jonathan Richardson 2014-12-30 22:43 ` [PATCH v4 1/3] pwm: kona: Fix incorrect config, disable, and polarity procedures Jonathan Richardson 2014-12-30 22:43 ` Jonathan Richardson 2014-12-30 22:43 ` [PATCH v4 2/3] pwm: kona: Remove setting default smooth type and polarity for all channels Jonathan Richardson 2014-12-30 22:43 ` Jonathan Richardson 2015-01-05 1:12 ` Tim Kryger 2015-01-05 1:33 ` Tim Kryger 2014-12-30 22:43 ` [PATCH v4 3/3] pwm: core: Set enable state properly on failed call to enable Jonathan Richardson 2014-12-30 22:43 ` Jonathan Richardson 2015-01-07 19:42 ` [PATCH v5 0/2] Fix bugs in kona pwm driver and pwm core Jonathan Richardson 2015-01-07 19:42 ` Jonathan Richardson 2015-01-07 19:42 ` [PATCH v5 1/2] pwm: kona: Fix incorrect config, disable, and polarity procedures Jonathan Richardson 2015-01-07 19:42 ` Jonathan Richardson 2015-01-07 19:42 ` Jonathan Richardson [this message] 2015-01-07 19:42 ` [PATCH v5 2/2] pwm: core: Set enable state properly on failed call to enable Jonathan Richardson 2015-02-11 23:59 ` Dmitry Torokhov 2015-02-24 19:13 ` [PATCH 0/1] Enable Broadcom Cygnus BCM958305K Jonathan Richardson 2015-02-24 19:13 ` Jonathan Richardson 2015-02-24 19:13 ` Jonathan Richardson 2015-02-24 19:13 ` [PATCH 1/1] ARM: dts: " Jonathan Richardson 2015-02-24 19:13 ` Jonathan Richardson 2015-02-24 19:13 ` Jonathan Richardson 2015-02-25 19:04 ` [PATCH 0/1] Synopsis 8250 serial port driver fix Jonathan Richardson 2015-02-25 19:04 ` Jonathan Richardson 2015-02-25 19:04 ` [PATCH 1/1] serial: 8250_dw: Fix get_mctrl behaviour Jonathan Richardson 2015-02-25 19:04 ` Jonathan Richardson 2015-02-25 19:21 ` Arnd Bergmann 2015-02-25 20:00 ` Jonathan Richardson 2015-02-25 20:00 ` Jonathan Richardson 2015-02-25 20:07 ` Arnd Bergmann 2015-02-27 0:35 ` [PATCH v2 0/1] Synopsis 8250 serial port driver fix Jonathan Richardson 2015-02-27 0:35 ` Jonathan Richardson 2015-02-27 0:35 ` [PATCH v2 1/1] serial: 8250_dw: Fix get_mctrl behaviour Jonathan Richardson 2015-02-27 0:35 ` Jonathan Richardson 2015-03-09 18:40 ` Dmitry Torokhov 2015-03-09 18:51 ` Jonathan Richardson 2015-03-09 18:51 ` Jonathan Richardson 2015-03-02 22:41 ` [PATCH RESEND 0/1] Enable Broadcom Cygnus BCM958305K Jonathan Richardson 2015-03-02 22:41 ` Jonathan Richardson 2015-03-02 22:41 ` Jonathan Richardson 2015-03-02 22:41 ` [PATCH RESEND 1/1] ARM: dts: " Jonathan Richardson 2015-03-02 22:41 ` Jonathan Richardson 2015-03-02 22:41 ` Jonathan Richardson 2015-03-02 23:45 ` Florian Fainelli 2015-03-02 23:45 ` Florian Fainelli 2015-03-02 23:45 ` Florian Fainelli 2015-03-11 1:17 ` [PATCH v3 0/2] Add support for Broadcom iProc touchscreen Jonathan Richardson 2015-03-11 1:17 ` Jonathan Richardson 2015-03-11 1:17 ` [PATCH v3 1/2] Input: touchscreen-iproc: Add Broadcom iProc touchscreen driver Jonathan Richardson 2015-03-11 1:17 ` Jonathan Richardson 2015-03-11 9:46 ` Paul Bolle 2015-03-11 17:05 ` Jonathan Richardson 2015-03-11 17:05 ` Jonathan Richardson 2015-03-11 1:17 ` [PATCH v3 2/2] Input: touchscreen-iproc: add device tree bindings Jonathan Richardson 2015-03-11 1:17 ` Jonathan Richardson 2015-03-12 17:45 ` [PATCH v4 0/2] Add support for Broadcom iProc touchscreen Jonathan Richardson 2015-03-12 17:45 ` Jonathan Richardson 2015-03-12 17:45 ` [PATCH v4 1/2] Input: touchscreen-iproc: Add Broadcom iProc touchscreen driver Jonathan Richardson 2015-03-12 17:45 ` Jonathan Richardson 2015-03-12 17:59 ` Joe Perches 2015-03-12 22:44 ` Jonathan Richardson 2015-03-12 22:44 ` Jonathan Richardson 2015-03-12 17:45 ` [PATCH v4 2/2] Input: touchscreen-iproc: add device tree bindings Jonathan Richardson 2015-03-12 17:45 ` Jonathan Richardson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1420659771-31401-3-git-send-email-jonathar@broadcom.com \ --to=jonathar@broadcom.com \ --cc=arun.ramamurthy@broadcom.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=rjui@broadcom.com \ --cc=sbranden@broadcom.com \ --cc=thierry.reding@gmail.com \ --cc=tim.kryger@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.