Skip to content

Commit a61dae1

Browse files
committed
Merge tag 'riscv-soc-fixes-for-v6.13-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes
RISC-V soc driver fixes for v6.13-rc4 A single fix for the Auto Update driver, where a mistake in array indexing (accessing as a u32 rather than a u8) caused the driver to read the wrong feature disable bits. Signed-off-by: Conor Dooley <[email protected]> * tag 'riscv-soc-fixes-for-v6.13-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: firmware: microchip: fix UL_IAP lock check in mpfs_auto_update_state() Link: https://lore.kernel.org/r/20241218-suffrage-unfazed-fa0113072a42@spud Signed-off-by: Arnd Bergmann <[email protected]>
2 parents f578281 + 48808b5 commit a61dae1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,10 @@ static int mpfs_auto_update_available(struct mpfs_auto_update_priv *priv)
402402
return -EIO;
403403

404404
/*
405-
* Bit 5 of byte 1 is "UL_Auto Update" & if it is set, Auto Update is
405+
* Bit 5 of byte 1 is "UL_IAP" & if it is set, Auto Update is
406406
* not possible.
407407
*/
408-
if (response_msg[1] & AUTO_UPDATE_FEATURE_ENABLED)
408+
if ((((u8 *)response_msg)[1] & AUTO_UPDATE_FEATURE_ENABLED))
409409
return -EPERM;
410410

411411
return 0;

0 commit comments

Comments
 (0)