All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Richardson <jonathar@broadcom.com>
To: Tim Kryger <tim.kryger@gmail.com>,
	Dmitry Torokhov <dtor@google.com>,
	Anatol Pomazau <anatol@google.com>,
	Arun Ramamurthy <arun.ramamurthy@broadcom.com>,
	Thierry Reding <thierry.reding@gmail.com>
Cc: Scott Branden <sbranden@broadcom.com>,
	Jonathan Richardson <jonathar@broadcom.com>,
	bcm-kernel-feedback-list <bcm-kernel-feedback-list@broadcom.com>,
	<linux-kernel@vger.kernel.org>, <linux-pwm@vger.kernel.org>
Subject: [PATCH v8 5/5] pwm: core: Set enable state properly on failed call to enable
Date: Tue, 26 May 2015 13:08:20 -0700	[thread overview]
Message-ID: <1432670900-27687-6-git-send-email-jonathar@broadcom.com> (raw)
In-Reply-To: <1432670900-27687-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>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jonathan Richardson <jonathar@broadcom.com>
---
 drivers/pwm/core.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 224645f..18f5ac4 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -477,10 +477,20 @@ 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)
+		return -EINVAL;
+
+	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);
+			return err;
+		}
+	}
 
-	return pwm ? 0 : -EINVAL;
+	return 0;
 }
 EXPORT_SYMBOL_GPL(pwm_enable);
 
-- 
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>,
	Dmitry Torokhov <dtor@google.com>,
	Anatol Pomazau <anatol@google.com>,
	Arun Ramamurthy <arun.ramamurthy@broadcom.com>,
	Thierry Reding <thierry.reding@gmail.com>
Cc: Scott Branden <sbranden@broadcom.com>,
	Jonathan Richardson <jonathar@broadcom.com>,
	bcm-kernel-feedback-list <bcm-kernel-feedback-list@broadcom.com>,
	linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org
Subject: [PATCH v8 5/5] pwm: core: Set enable state properly on failed call to enable
Date: Tue, 26 May 2015 13:08:20 -0700	[thread overview]
Message-ID: <1432670900-27687-6-git-send-email-jonathar@broadcom.com> (raw)
In-Reply-To: <1432670900-27687-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>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jonathan Richardson <jonathar@broadcom.com>
---
 drivers/pwm/core.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 224645f..18f5ac4 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -477,10 +477,20 @@ 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)
+		return -EINVAL;
+
+	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);
+			return err;
+		}
+	}
 
-	return pwm ? 0 : -EINVAL;
+	return 0;
 }
 EXPORT_SYMBOL_GPL(pwm_enable);
 
-- 
1.7.9.5

  parent reply	other threads:[~2015-05-26 20:06 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26 20:08 [PATCH v8 0/5] Fix bugs in kona pwm driver and pwm core Jonathan Richardson
2015-05-26 20:08 ` Jonathan Richardson
2015-05-26 20:08 ` [PATCH v8 1/5] drivers: pwm: core: Add pwmchip_add_inversed Jonathan Richardson
2015-05-26 20:08   ` Jonathan Richardson
2015-06-12  9:45   ` Thierry Reding
2015-06-15  0:51     ` Tim Kryger
2015-05-26 20:08 ` [PATCH v8 2/5] drivers: pwm: bcm-kona: Dont set polarity in probe Jonathan Richardson
2015-05-26 20:08   ` Jonathan Richardson
2015-06-12  9:46   ` Thierry Reding
2015-05-26 20:08 ` [PATCH v8 3/5] pwm: kona: Fix incorrect config, disable, and polarity procedures Jonathan Richardson
2015-05-26 20:08   ` Jonathan Richardson
2015-05-30 16:41   ` Tim Kryger
2015-06-12 21:28     ` Jonathan Richardson
2015-05-26 20:08 ` [PATCH v8 4/5] pwm: kona: Add debug info to config function Jonathan Richardson
2015-05-26 20:08   ` Jonathan Richardson
2015-05-30 16:42   ` Tim Kryger
2015-06-12 21:29     ` Jonathan Richardson
2015-05-26 20:08 ` Jonathan Richardson [this message]
2015-05-26 20:08   ` [PATCH v8 5/5] pwm: core: Set enable state properly on failed call to enable Jonathan Richardson
2015-06-12  9:49   ` Thierry Reding
2015-06-12 19:22     ` Jonathan Richardson
2015-06-12 19:22       ` 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=1432670900-27687-6-git-send-email-jonathar@broadcom.com \
    --to=jonathar@broadcom.com \
    --cc=anatol@google.com \
    --cc=arun.ramamurthy@broadcom.com \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=dtor@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --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: link
Be 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.