From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755611AbbDJS4w (ORCPT ); Fri, 10 Apr 2015 14:56:52 -0400 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:2121 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752045AbbDJS4l (ORCPT ); Fri, 10 Apr 2015 14:56:41 -0400 X-IronPort-AV: E=Sophos;i="5.11,558,1422950400"; d="scan'208";a="61661531" From: Jonathan Richardson To: Tim Kryger , Dmitry Torokhov , Anatol Pomazau , Arun Ramamurthy , Thierry Reding CC: Scott Branden , Jonathan Richardson , bcm-kernel-feedback-list , , Subject: [PATCH v6 4/4] pwm: core: Set enable state properly on failed call to enable Date: Fri, 10 Apr 2015 11:58:53 -0700 Message-ID: <1428692333-14400-5-git-send-email-jonathar@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1428692333-14400-1-git-send-email-jonathar@broadcom.com> References: <1428692333-14400-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 Reviewed-by: Dmitry Torokhov Signed-off-by: Jonathan Richardson --- 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 c0a550b..793add5 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