Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
base
/
firmware_class.c
diff --git
a/kernel/drivers/base/firmware_class.c
b/kernel/drivers/base/firmware_class.c
index
8524450
..
ccfd268
100644
(file)
--- a/
kernel/drivers/base/firmware_class.c
+++ b/
kernel/drivers/base/firmware_class.c
@@
-942,13
+942,14
@@
static int _request_firmware_load(struct firmware_priv *fw_priv,
timeout = MAX_JIFFY_OFFSET;
}
timeout = MAX_JIFFY_OFFSET;
}
-
retval
= wait_for_completion_interruptible_timeout(&buf->completion,
+
timeout
= wait_for_completion_interruptible_timeout(&buf->completion,
timeout);
timeout);
- if (retval == -ERESTARTSYS || !retval) {
+ if (timeout == -ERESTARTSYS || !timeout) {
+ retval = timeout;
mutex_lock(&fw_lock);
fw_load_abort(fw_priv);
mutex_unlock(&fw_lock);
mutex_lock(&fw_lock);
fw_load_abort(fw_priv);
mutex_unlock(&fw_lock);
- } else if (
retval
> 0) {
+ } else if (
timeout
> 0) {
retval = 0;
}
retval = 0;
}