From: Rafael J. Wysocki Date: Thu, 4 Nov 2021 21:54:17 +0000 (+0100) Subject: ACPI: PM: Fix device wakeup power reference counting error X-Git-Tag: v5.14.19~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=006b5af213cd83ee4af286ef333d107a5e91a1e9;p=thirdparty%2Fkernel%2Fstable.git ACPI: PM: Fix device wakeup power reference counting error [ 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 --- 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);