From 2fd0b28e63fc9a5855b5a5a6ae4a1137df17d8e9 Mon Sep 17 00:00:00 2001 From: Qiufang Dai Date: Thu, 26 Dec 2019 12:05:22 +0800 Subject: [PATCH] suspend: fix freeze abort hangup which caused by insmod [1/1] PD#GH-134 Problem: When freeze abort happen, it will lose device_unblock_probing(), so device probe is blocked. Solution: When freeze abort happen, release device_block_probing Verify: SM1_S905D3_AC200 Change-Id: I3e591fe9ed392b6a4d30285817a91fbfec25336f Signed-off-by: Qiufang Dai --- kernel/power/suspend.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 71050f5841a3..853dced7fb26 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -314,6 +314,11 @@ static int suspend_prepare(suspend_state_t state) if (!error) return 0; +#ifdef CONFIG_AMLOGIC_MODIFY + /* Allow device probing and trigger re-probing of deferred devices */ + device_unblock_probing(); +#endif + suspend_stats.failed_freeze++; dpm_save_failed_step(SUSPEND_FREEZE); Finish: -- 2.20.1