Commit 171d4ff7 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 8fa5960f 14801c62
...@@ -1320,7 +1320,7 @@ static void mmc_spi_dma_free(struct mmc_spi_host *host) ...@@ -1320,7 +1320,7 @@ static void mmc_spi_dma_free(struct mmc_spi_host *host)
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
} }
#else #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) {} static inline void mmc_spi_dma_free(struct mmc_spi_host *host) {}
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment