Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d0c81b4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "firmware: avoid invalid fallback aborts by using killable wait"

parents e6a917b7 6d907fd9

drivers/base/firmware_class.c

+1 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,7 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, 
		timeout = MAX_JIFFY_OFFSET;

	}



	timeout = wait_for_completion_interruptible_timeout(&buf->completion,

	timeout = wait_for_completion_killable_timeout(&buf->completion,

			timeout);

	if (timeout == -ERESTARTSYS || !timeout) {

		retval = timeout;