| From 29bdedfd9cf40e59456110ca417a8cb672ac9b92 Mon Sep 17 00:00:00 2001 |
| From: Lukas Wunner <lukas@wunner.de> |
| Date: Thu, 29 Nov 2018 15:14:49 +0100 |
| Subject: spi: bcm2835: Unbreak the build of esoteric configs |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Lukas Wunner <lukas@wunner.de> |
| |
| commit 29bdedfd9cf40e59456110ca417a8cb672ac9b92 upstream. |
| |
| Commit e82b0b382845 ("spi: bcm2835: Fix race on DMA termination") broke |
| the build with COMPILE_TEST=y on arches whose cmpxchg() requires 32-bit |
| operands (xtensa, older arm ISAs). |
| |
| Fix by changing the dma_pending flag's type from bool to unsigned int. |
| |
| Fixes: e82b0b382845 ("spi: bcm2835: Fix race on DMA termination") |
| Signed-off-by: Lukas Wunner <lukas@wunner.de> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Cc: Frank Pavlic <f.pavlic@kunbus.de> |
| Cc: Martin Sperl <kernel@martin.sperl.org> |
| Cc: Noralf Trønnes <noralf@tronnes.org> |
| Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/spi/spi-bcm2835.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/spi/spi-bcm2835.c |
| +++ b/drivers/spi/spi-bcm2835.c |
| @@ -88,7 +88,7 @@ struct bcm2835_spi { |
| u8 *rx_buf; |
| int tx_len; |
| int rx_len; |
| - bool dma_pending; |
| + unsigned int dma_pending; |
| }; |
| |
| static inline u32 bcm2835_rd(struct bcm2835_spi *bs, unsigned reg) |
