From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 502AFC433EF for ; Mon, 15 Nov 2021 23:21:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3750F6113D for ; Mon, 15 Nov 2021 23:21:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353980AbhKOXYg (ORCPT ); Mon, 15 Nov 2021 18:24:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:44628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244933AbhKOTSO (ORCPT ); Mon, 15 Nov 2021 14:18:14 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E06F6342E; Mon, 15 Nov 2021 18:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637000739; bh=UsCMY0vPhkfnNm4ouVzXAVYprKlsfPZLk37GB5JhQeQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ltMeuAmY7naaHlryIa5VMzDvA1A+vPu/Nt1/YhSD3lQq5xgQb8kgTsX708xhSh33N M6AbuR2aePkVEim5Md9QZbv3LRquMa8K9TOXtb6Yk/O2nME3wHehxreubJHz9bAGrv kJLU/xehcwcR8NoMUB8j9yI7xhjZLfw87GtKXpyk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.14 746/849] ACPI: PM: Fix device wakeup power reference counting error Date: Mon, 15 Nov 2021 18:03:49 +0100 Message-Id: <20211115165445.493088465@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165419.961798833@linuxfoundation.org> References: <20211115165419.961798833@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki [ Upstream commit 452a3e723f75880757acf87b053935c43aa89f89 ] Fix a device wakeup power reference counting error introduced by commit a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power resources") because of a coding mistake. Fixes: a2d7b2e004af ("ACPI: PM: Fix sharing of wakeup power resources") Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/power.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index e1f9a45587857..36c554a1cfbf4 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -746,13 +746,11 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev) mutex_lock(&acpi_device_lock); - if (dev->wakeup.prepare_count > 1) { - dev->wakeup.prepare_count--; + /* Do nothing if wakeup power has not been enabled for this device. */ + if (dev->wakeup.prepare_count <= 0) goto out; - } - /* Do nothing if wakeup power has not been enabled for this device. */ - if (!dev->wakeup.prepare_count) + if (--dev->wakeup.prepare_count > 0) goto out; err = acpi_device_sleep_wake(dev, 0, 0, 0); -- 2.33.0