Merge branch 'fixes' into next

a49e391c · Ulf Hansson · 91ca244b · 14801c62 · a49e391c
Commit a49e391c authored Sep 14, 2020 by Ulf Hansson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/mmc/host/mmc_spi.c drivers/mmc/host/mmc_spi.c +1 -1

No files found.
--- 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