diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:27 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 12:04:27 +0800 |
| commit | cb370744bc101be91a0bc3e9fbdb670ab44df97d (patch) | |
| tree | 1a84448b43dee0f4e255f9434e776c51812ddb35 /drivers/base/firmware_class.c | |
| parent | 67f07b48af22065412ba4e78472121c0a9f58329 (diff) | |
| parent | f40b3cc69de8c97bbcdb74e3cffda06ffcad2cd7 (diff) | |
Merge tag 'v4.1.38' into linux-linaro-lsk-v4.1lsk-v4.1-17.02
This is the 4.1.38 stable release
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 4d1d9de4f9bf..8b0b95014465 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -923,13 +923,14 @@ static int _request_firmware_load(struct firmware_priv *fw_priv, timeout = MAX_JIFFY_OFFSET; } - retval = wait_for_completion_interruptible_timeout(&buf->completion, + timeout = wait_for_completion_interruptible_timeout(&buf->completion, timeout); - if (retval == -ERESTARTSYS || !retval) { + if (timeout == -ERESTARTSYS || !timeout) { + retval = timeout; mutex_lock(&fw_lock); fw_load_abort(fw_priv); mutex_unlock(&fw_lock); - } else if (retval > 0) { + } else if (timeout > 0) { retval = 0; } |