diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-08-28 20:28:51 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-08-28 20:28:52 +0000 |
| commit | 3536c01d6577ce4612617ced32dbc891f39f9d64 (patch) | |
| tree | bc24a35e599f57f3c7cc65931302b08f6213ee14 /drivers/firmware | |
| parent | ec57571b5dda1fdd68b572e1e980c52d1edb0b0d (diff) | |
| parent | 591940e22e287fb64ac07be275e343d860cb72d6 (diff) | |
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 <conor.dooley@microchip.com>
* 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 <arnd@arndb.de>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/microchip/mpfs-auto-update.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c index 30de47895b1c..9ca5ee58edbd 100644 --- a/drivers/firmware/microchip/mpfs-auto-update.c +++ b/drivers/firmware/microchip/mpfs-auto-update.c @@ -166,7 +166,7 @@ static enum fw_upload_err mpfs_auto_update_poll_complete(struct fw_upload *fw_up */ ret = wait_for_completion_timeout(&priv->programming_complete, msecs_to_jiffies(AUTO_UPDATE_TIMEOUT_MS)); - if (ret) + if (!ret) return FW_UPLOAD_ERR_TIMEOUT; return FW_UPLOAD_ERR_NONE; |