From patchwork Tue Dec 23 09:51:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5531531 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7273BEEA8 for ; Tue, 23 Dec 2014 09:51:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD66B201C0 for ; Tue, 23 Dec 2014 09:51:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25701200DC for ; Tue, 23 Dec 2014 09:51:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753998AbaLWJvp (ORCPT ); Tue, 23 Dec 2014 04:51:45 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:34487 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751046AbaLWJvo (ORCPT ); Tue, 23 Dec 2014 04:51:44 -0500 Received: by mail-pa0-f50.google.com with SMTP id bj1so7603483pad.37; Tue, 23 Dec 2014 01:51:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ECi8qlDKTqmVQsSwPAc4DXhadxTvVJFYXm61G72aaNM=; b=ODKuZSDVmdR1TC0YJIx2t8mnJ4nwzKiKv9DExUG6E8kMumhNuBTLkDCHDLJxVqYEsu k99/xGt+oVF/NKPjPQPiN+Lo1jLF8tXgbz/lZOa00GU5jZk5b3EoD9sp0gUuy6d0KM48 L8Cjgv/+Gsozvip25767fOsFijZUH+C4YEJ+hy9NQgQZoPTbC0bVE+l824s4oJYtGrDk PeelQxUOLlKqu7sN/J9k/OFrdu9gN9YnsZAXN/0oFwuF7U+1nm+MaJqHN8mDXg17qZEg HZAUEYeCXj4e+zOna2aqmVJ/65g1Krr/E9GrJ+i+sZv2/jk23hdtrJxlVIppHgiA5Wcb GW9Q== X-Received: by 10.68.138.194 with SMTP id qs2mr24756408pbb.8.1419328303809; Tue, 23 Dec 2014 01:51:43 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id kw10sm19581434pab.29.2014.12.23.01.51.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Dec 2014 01:51:43 -0800 (PST) From: Dmitry Eremin-Solenikov To: Sebastian Reichel Cc: linux-pm@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/2] power: gpio-charger: balance enable/disable_irq_wake calls Date: Tue, 23 Dec 2014 12:51:26 +0300 Message-Id: <1419328286-29729-2-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1419328286-29729-1-git-send-email-dbaryshkov@gmail.com> References: <1419328286-29729-1-git-send-email-dbaryshkov@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP enable_irq_wakeup returns 0 in case it correctly enabled the IRQ to generate the wakeup event (and thus resume should call disable_irq_wake). Currently gpio-charger driver has this logic inverted. Correct that thus correcting enable/disable_irq_wake() calls balance. Cc: stable@vger.kernel.org Signed-off-by: Dmitry Eremin-Solenikov --- drivers/power/gpio-charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c index 7536933..cc98763 100644 --- a/drivers/power/gpio-charger.c +++ b/drivers/power/gpio-charger.c @@ -168,7 +168,7 @@ static int gpio_charger_suspend(struct device *dev) if (device_may_wakeup(dev)) gpio_charger->wakeup_enabled = - enable_irq_wake(gpio_charger->irq); + !enable_irq_wake(gpio_charger->irq); return 0; }