Skip to content

Commit 3536c01

Browse files
committed
Merge tag 'riscv-soc-fixes-for-v6.11-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes
RISC-V soc fixes for v6.11-rc6 Prevent an erroneous unconditional report of a timeout during firmware upload in the mpfs-auto-update driver. Signed-off-by: Conor Dooley <[email protected]> * tag 'riscv-soc-fixes-for-v6.11-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: firmware: microchip: fix incorrect error report of programming:timeout on success Link: https://lore.kernel.org/r/20240828-fidelity-almighty-18d5434aaef0@spud Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ec57571 + 591940e commit 3536c01

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/firmware/microchip/mpfs-auto-update.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static enum fw_upload_err mpfs_auto_update_poll_complete(struct fw_upload *fw_up
166166
*/
167167
ret = wait_for_completion_timeout(&priv->programming_complete,
168168
msecs_to_jiffies(AUTO_UPDATE_TIMEOUT_MS));
169-
if (ret)
169+
if (!ret)
170170
return FW_UPLOAD_ERR_TIMEOUT;
171171

172172
return FW_UPLOAD_ERR_NONE;

0 commit comments

Comments
 (0)