diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-05-09 11:27:17 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-09 11:27:17 +0900 |
| commit | 0ed56252c9567351344cb7b5cff6140e1bcec943 (patch) | |
| tree | 822129b7aeb183e3d787f9c7e92b9b46d6958d95 /drivers/spi | |
| parent | spi: Clear SPI_CS_HIGH flag from bad_bits for GPIO chip-select (diff) | |
| download | linux-dev-0ed56252c9567351344cb7b5cff6140e1bcec943.tar.xz linux-dev-0ed56252c9567351344cb7b5cff6140e1bcec943.zip | |
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/spi')
| -rw-r--r-- | drivers/spi/spi.c | 4 |
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; } |