projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
input: touchscreen: add touch screen of gslx680 for rk3399-firefly-edp
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
base
/
firmware_class.c
diff --git
a/drivers/base/firmware_class.c
b/drivers/base/firmware_class.c
index 8524450e75bd15d8f97327af84662b4af32fc3a7..ccfd268148a8f5fc0ee0b2642d63267ef12a51aa 100644
(file)
--- a/
drivers/base/firmware_class.c
+++ b/
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;
}