aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-11-29 16:23:39 +0000
committerMark Brown <broonie@kernel.org>2018-11-29 16:23:39 +0000
commit5651248697f70aad78aa0208490c776d1f842315 (patch)
treeeaa8104aaca1feec2dc44a3de92ea03c449c30b9 /drivers/spi
parent3bd7f6589f67f05a7901bdc2810631814d89e462 (diff)
parent29bdedfd9cf40e59456110ca417a8cb672ac9b92 (diff)
Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-4.21
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-bcm2835.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 232002db2696..5cbdc94bb4cf 100644
--- 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)

Privacy Policy