From: Mark Brown <broonie@kernel.org>
Date: Thu, 9 May 2019 02:27:17 +0000 (+0900)
Subject: spi: Fix Raspberry Pi breakage
X-Git-Tag: v5.2-rc5~29^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ed56252c9567351344cb7b5cff6140e1bcec943;p=thirdparty%2Flinux.git

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>
---

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 5e75944ad5d1c..8eb7460dd744a 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;
 }