summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-05-09 05:27:17 +0300
committerMark Brown <broonie@kernel.org>2019-05-09 05:27:17 +0300
commit0ed56252c9567351344cb7b5cff6140e1bcec943 (patch)
tree822129b7aeb183e3d787f9c7e92b9b46d6958d95 /drivers
parentd61ad23cb3be09ff4956e9b9794134456522817f (diff)
downloadlinux-0ed56252c9567351344cb7b5cff6140e1bcec943.tar.xz
spi: Fix Raspberry Pi breakage
This reverts commit c9ba7a16d0f1 (Release spi_res after finalizing message) which causes races during cleanup. Reported-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 5e75944ad5d1..8eb7460dd744 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1181,10 +1181,10 @@ out:
if (msg->status && ctlr->handle_err)
ctlr->handle_err(ctlr, msg);
- spi_finalize_current_message(ctlr);
-
spi_res_release(ctlr, msg);
+ spi_finalize_current_message(ctlr);
+
return ret;
}