From: Zahari Doychev Date: Tue, 10 Mar 2015 09:45:40 +0000 (+0100) Subject: drivers: base: fw: fix ret value when loading fw X-Git-Tag: firefly_0821_release~176^2~1999^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ef518cc8aa4427043efe21cb2f0799be9cb1d74d;p=firefly-linux-kernel-4.4.55.git 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: Zahari Doychev Cc: Ming Lei Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 1b5bfd7cf6b6..171841ad1008 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -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))