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

Commit ef518cc8 authored by Zahari Doychev's avatar Zahari Doychev Committed by Greg Kroah-Hartman
Browse files

drivers: base: fw: fix ret value when loading fw 



When using the user mode helper to load firmwares the function _request_firmware
gets a positive return value from fw_load_from_user_helper and because of this
the firmware buffer is not assigned. This happens only when the return value
is zero. This patch fixes this problem in _request_firmware_load. When the
completion is ready the return value is set to zero.

Signed-off-by: default avatarZahari Doychev <zahari.doychev@linux.com>
Cc: Ming Lei <ming.lei@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46239902

drivers/base/firmware_class.c

+2 −0
Original line number Diff line number Diff line
@@ -919,6 +919,8 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, 
		mutex_lock(&fw_lock);

		fw_load_abort(fw_priv);

		mutex_unlock(&fw_lock);

	} else if (retval > 0) {

		retval = 0;

	}



	if (is_fw_load_aborted(buf))