summaryrefslogtreecommitdiff
path: root/drivers/parisc
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2024-01-03 23:17:23 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-01 03:16:59 +0300
commitb37c1b0db14db0db487afa003e9fc0f47beb98de (patch)
treef3bb0277f74e7845d8d2eb958239eb711d263d8e /drivers/parisc
parent71602d95ae6401382a359ca7fced6c7a9dda0104 (diff)
downloadlinux-b37c1b0db14db0db487afa003e9fc0f47beb98de.tar.xz
parisc/power: Fix power soft-off button emulation on qemu
commit 6472036581f947109b20664121db1d143e916f0b upstream. Make sure to start the kthread to check the power button on qemu as well if the power button address was provided. This fixes the qemu built-in system_powerdown runtime command. Fixes: d0c219472980 ("parisc/power: Add power soft-off when running on qemu") Signed-off-by: Helge Deller <deller@gmx.de> Cc: stable@vger.kernel.org # v6.0+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/parisc')
-rw-r--r--drivers/parisc/power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 332bcc0053a5..498bae2e3403 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -238,7 +238,7 @@ static int __init power_init(void)
if (running_on_qemu && soft_power_reg)
register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_DEFAULT,
qemu_power_off, (void *)soft_power_reg);
- else
+ if (!running_on_qemu || soft_power_reg)
power_task = kthread_run(kpowerswd, (void*)soft_power_reg,
KTHREAD_NAME);
if (IS_ERR(power_task)) {