diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-21 15:45:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-21 15:45:06 -0800 |
| commit | 48f506ad0b683d3e7e794efa60c5785c4fdc86fa (patch) | |
| tree | c632a82e78af8e5b34867ca99601722f144dc8d5 /drivers | |
| parent | 4aa748dd1abf337426b4c941ae1b606ed0e2a5aa (diff) | |
| parent | a31ffd6ed5ee994e1c04dc794499a0c04618dc55 (diff) | |
| download | lwn-48f506ad0b683d3e7e794efa60c5785c4fdc86fa.tar.gz lwn-48f506ad0b683d3e7e794efa60c5785c4fdc86fa.zip | |
Merge tag 'soc-fixes-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"Two more small fixes, correcting the cacheline size on Raspberry Pi 5
and fixing a logic mistake in the microchip mpfs firmware driver"
* tag 'soc-fixes-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: dts: broadcom: Fix L2 linesize for Raspberry Pi 5
firmware: microchip: fix UL_IAP lock check in mpfs_auto_update_state()
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; |