spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error"

Browse source

Commit 5c0ba57744 ("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>

...

This commit is contained in:

Heiner Kallweit 2016-10-27 20:24:19 +02:00 • committed by Mark Brown

parent f9ce28f923

commit e3cd6cf425

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/spi/spi-fsl-espi.c

View file