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

…l/git/broonie/spi into spi-4.21
mariux64 · Nov 29, 2018 · 5651248 · 5651248
2 parents 3bd7f65 + 29bdedf
commit 5651248
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)