diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-12-20 18:00:30 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-12-20 18:00:30 +0100 |
| commit | a61dae110138b4eb7e4ffab301d156bc2ce13605 (patch) | |
| tree | 12a052085da198d462d8ed27a856bd20ff01ccc3 /drivers | |
| parent | f578281000c50cae991c40e1f68b2fc0b1b9e60e (diff) | |
| parent | 48808b55b07c3cea64805267a5547f03e6452a9f (diff) | |
| download | lwn-a61dae110138b4eb7e4ffab301d156bc2ce13605.tar.gz lwn-a61dae110138b4eb7e4ffab301d156bc2ce13605.zip | |
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 <conor.dooley@microchip.com>
* 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 <arnd@arndb.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/microchip/mpfs-auto-update.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c index 38a03698cec9..e194f7acb2a9 100644 --- a/drivers/firmware/microchip/mpfs-auto-update.c +++ b/drivers/firmware/microchip/mpfs-auto-update.c @@ -402,10 +402,10 @@ static int mpfs_auto_update_available(struct mpfs_auto_update_priv *priv) return -EIO; /* - * Bit 5 of byte 1 is "UL_Auto Update" & if it is set, Auto Update is + * Bit 5 of byte 1 is "UL_IAP" & if it is set, Auto Update is * not possible. */ - if (response_msg[1] & AUTO_UPDATE_FEATURE_ENABLED) + if ((((u8 *)response_msg)[1] & AUTO_UPDATE_FEATURE_ENABLED)) return -EPERM; return 0; |