summary refs log tree commit diff
path: root/drivers/tty
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2023-07-13 16:57:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-03 10:24:08 +0200
commit016a4a2a75870c794587d2f0d30abdae5b87ec0f (patch)
tree78b14b54956ef74466bfd47fcf570ef39472721c /drivers/tty
parenteb1a542824ee58bc76a1277af45607c67ae8954f (diff)
downloadlinux-016a4a2a75870c794587d2f0d30abdae5b87ec0f.tar.gz
serial: qcom-geni: drop bogus runtime pm state update
commit 4dd8752a14ca0303fbdf0a6c68ff65f0a50bd2fa upstream.

The runtime PM state should not be changed by drivers that do not
implement runtime PM even if it happens to work around a bug in PM core.

With the wake irq arming now fixed, drop the bogus runtime PM state
update which left the device in active state (and could potentially
prevent a parent device from suspending).

Fixes: f3974413cf02 ("tty: serial: qcom_geni_serial: Wakeup IRQ cleanup")
Cc: 5.6+ <stable@vger.kernel.org> # 5.6+
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/qcom_geni_serial.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index cf9dc2ddfe66..6f6c4e9b7743 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -1495,13 +1495,6 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	/*
-	 * Set pm_runtime status as ACTIVE so that wakeup_irq gets
-	 * enabled/disabled from dev_pm_arm_wake_irq during system
-	 * suspend/resume respectively.
-	 */
-	pm_runtime_set_active(&pdev->dev);
-
 	if (port->wakeup_irq > 0) {
 		device_init_wakeup(&pdev->dev, true);
 		ret = dev_pm_set_dedicated_wake_irq(&pdev->dev,