Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 232002db26966faa452e3f376cde58f6f51e0304..5cbdc94bb4cfd96fe1c53943b64966a079a478ac 100644 (file)
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -109,7 +109,7 @@ struct bcm2835_spi {
        int tx_prologue;
        int rx_prologue;
        bool tx_spillover;
-       bool dma_pending;
+       unsigned int dma_pending;
 };
 
 static inline u32 bcm2835_rd(struct bcm2835_spi *bs, unsigned reg)