From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754865AbbAGTmw (ORCPT ); Wed, 7 Jan 2015 14:42:52 -0500 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:25392 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754388AbbAGTmk (ORCPT ); Wed, 7 Jan 2015 14:42:40 -0500 X-IronPort-AV: E=Sophos;i="5.07,716,1413270000"; d="scan'208";a="54210246" From: Jonathan Richardson To: Tim Kryger CC: Scott Branden , Arun Ramamurthy , Thierry Reding , Ray Jui , , , , "Jonathan Richardson" 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 Message-ID: <1420659771-31401-3-git-send-email-jonathar@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1420659771-31401-1-git-send-email-jonathar@broadcom.com> References: <1420659771-31401-1-git-send-email-jonathar@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Jonathan Richardson --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Richardson 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 Message-ID: <1420659771-31401-3-git-send-email-jonathar@broadcom.com> References: <1420659771-31401-1-git-send-email-jonathar@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:25392 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754388AbbAGTmk (ORCPT ); Wed, 7 Jan 2015 14:42:40 -0500 In-Reply-To: <1420659771-31401-1-git-send-email-jonathar@broadcom.com> Sender: linux-pwm-owner@vger.kernel.org List-Id: linux-pwm@vger.kernel.org To: Tim Kryger Cc: Scott Branden , Arun Ramamurthy , Thierry Reding , Ray Jui , bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, Jonathan Richardson 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 Signed-off-by: Jonathan Richardson --- 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