Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934220AbbELXZz (ORCPT ); Tue, 12 May 2015 19:25:55 -0400 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:22760 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934132AbbELXZa (ORCPT ); Tue, 12 May 2015 19:25:30 -0400 X-IronPort-AV: E=Sophos;i="5.13,418,1427785200"; d="scan'208";a="64537932" 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 v7 5/5] pwm: core: Set enable state properly on failed call to enable Date: Tue, 12 May 2015 16:28:16 -0700 Message-ID: <1431473296-13683-6-git-send-email-jonathar@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1431473296-13683-1-git-send-email-jonathar@broadcom.com> References: <1431473296-13683-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 Content-Length: 1436 Lines: 48 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 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/