Merge tag 'v3.18-rc1' into v4l_for_linus

[firefly-linux-kernel-4.4.55.git] / drivers / parisc / power.c

diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 90cca5e3805f584cbf3a571098e64f684aca3797..ef31b77404ef8e1113010805cbcbe46b71f1ff0f 100644 (file)
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -121,7 +121,6 @@ static int kpowerswd(void *param)
                unsigned long soft_power_reg = (unsigned long) param;
 
                schedule_timeout_interruptible(pwrsw_enabled ? HZ : HZ/POWERSWITCH_POLL_PER_SEC);
-               __set_current_state(TASK_RUNNING);
 
                if (unlikely(!pwrsw_enabled))
                        continue;