summaryrefslogtreecommitdiff
path: root/Cmds
diff options
context:
space:
mode:
Diffstat (limited to 'Cmds')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-06 12:25:01 +0000
id=e3cd6cf425bf40061418edf7b295f654301446fe&id2=f9ce28f92385622070f398660e7b2066f02997c8'>diff)
spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error"
Commit 5c0ba57744b1 ("spi: fsl-espi: avoid processing uninitalized data on error") applied fine to stable but caused a merge conflict on next. This patch fixes that. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat
-rw-r--r--drivers/spi/spi-fsl-espi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c