Unverified Commit 3536c01d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-soc-fixes-for-v6.11-rc6' of... 

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: default avatarConor 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: default avatarArnd Bergmann <arnd@arndb.de>
parents ec57571b 591940e2

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

+1 −1
Original line number Diff line number Diff line
@@ -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;