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

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

drivers/mmc/host/mmc_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -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