]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
spi: bcm2835: Unbreak the build of esoteric configs
authorLukas Wunner <lukas@wunner.de>
Thu, 29 Nov 2018 14:14:49 +0000 (15:14 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jan 2019 09:05:31 +0000 (10:05 +0100)
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

index 92f45b6fd278aae3995bd42f77fb0d9540c22e36..1a1368f5863cd010f3d3404c05cc11eaea851112 100644 (file)
@@ -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)