diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-24 09:09:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-24 09:09:47 -0700 |
| commit | 171d4ff79f965c1f164705ef0aaea102a6ad238b (patch) | |
| tree | bb565b6f37ca8f327765a1807464234cc179edd1 | |
| parent | 8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0 (diff) | |
| parent | 14801c624066a55139c2c57963eb1b859d0a316a (diff) | |
| download | linux-171d4ff79f965c1f164705ef0aaea102a6ad238b.tar.bz2 | |
Merge tag 'mmc-v5.9-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fix from Ulf Hansson:
"Fix build warning in mmc_spi when CONFIG_HAS_DMA is unset"
* tag 'mmc-v5.9-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA
| -rw-r--r-- | drivers/mmc/host/mmc_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 5055a7eb134a..18a850f37ddc 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -1320,7 +1320,7 @@ static void mmc_spi_dma_free(struct mmc_spi_host *host) DMA_BIDIRECTIONAL); } #else -static inline mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } +static inline int mmc_spi_dma_alloc(struct mmc_spi_host *host) { return 0; } static inline void mmc_spi_dma_free(struct mmc_spi_host *host) {} #endif |