|
@@ -957,13 +957,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);
|
|
mutex_lock(&fw_lock);
|
|
|
fw_load_abort(fw_priv);
|
|
fw_load_abort(fw_priv);
|
|
|
mutex_unlock(&fw_lock);
|
|
mutex_unlock(&fw_lock);
|
|
|
- } else if (retval > 0) {
|
|
|
|
|
|
|
+ } else if (timeout > 0) {
|
|
|
retval = 0;
|
|
retval = 0;
|
|
|
}
|
|
}
|
|
|
|
|
|