Merge pull request #625 from FrameworkComputer/hx30.PB_behavior

Iris: fix FP pwrbtn stuck in hold state

Author: kiram9

board/hx30/power_button_x86.c

@@ -444,16 +444,15 @@ static void state_machine(uint64_t tnow)
 	case PWRBTN_STATE_HELD:
 
 		if (power_button_is_pressed()) {
+			tnext_state = tnow + PWRBTN_WAIT_HOLD;
 			if (!gpio_get_level(GPIO_ON_OFF_FP_L)) {
-				tnext_state = tnow + PWRBTN_WAIT_HOLD;
 				if (++hold_check < PWRBTN_FP_HOLD_COUNT)
 					break;
 
 				hold_check = 0;
 				tnext_state = tnow + PWRBTN_STATE_DELAY;
 				pwrbtn_state = PWRBTN_STATE_NEED_SHUTDOWN;
 			} else if (!gpio_get_level(GPIO_ON_OFF_BTN_L)) {
-				tnext_state = tnow + PWRBTN_WAIT_HOLD;
 				if (++hold_check < PWRBTN_HOLD_COUNT)
 					break;