Merge 5.14-rc5 into driver-core-next

We need the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-08-09 09:03:47 +02:00
parent 96ba6c6e89 36a21d5172
commit bd935a7b21
518 changed files with 5466 additions and 2330 deletions
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -781,8 +781,10 @@ static void fw_abort_batch_reqs(struct firmware *fw)
 		return;

 	fw_priv = fw->priv;
+	mutex_lock(&fw_lock);
 	if (!fw_state_is_aborted(fw_priv))
 		fw_state_aborted(fw_priv);
+	mutex_unlock(&fw_lock);
 }

 /* called from request_firmware() and request_firmware_work_func() */