~hc/RK356X_SDK_RELEASE.git

..	..	@@ -91,6 +91,7 @@
91	91	DEFINE_MUTEX(fw_lock);
92	92
93	93	static struct firmware_cache fw_cache;
	94	+bool fw_load_abort_all;
94	95
95	96	/* Builtin firmware support */
96	97
..	..	@@ -1442,10 +1443,10 @@
1442	1443	case PM_SUSPEND_PREPARE:
1443	1444	case PM_RESTORE_PREPARE:
1444	1445	/*
1445		- * kill pending fallback requests with a custom fallback
1446		- * to avoid stalling suspend.
	1446	+ * Here, kill pending fallback requests will only kill
	1447	+ * non-uevent firmware request to avoid stalling suspend.
1447	1448	*/
1448		- kill_pending_fw_fallback_reqs(true);
	1449	+ kill_pending_fw_fallback_reqs(false);
1449	1450	device_cache_fw_images();
1450	1451	break;
1451	1452
..	..	@@ -1530,7 +1531,7 @@
1530	1531	* Kill all pending fallback requests to avoid both stalling shutdown,
1531	1532	* and avoid a deadlock with the usermode_lock.
1532	1533	*/
1533		- kill_pending_fw_fallback_reqs(false);
	1534	+ kill_pending_fw_fallback_reqs(true);
1534	1535
1535	1536	return NOTIFY_DONE;
1536	1537	}