diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2020-09-14 11:46:47 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2020-09-14 11:46:47 +0200 |
| commit | a49e391c49c2ef3e8590030c522f195294532bad (patch) | |
| tree | de2f8f7fac02813254b02eae00c150ff256eac22 | |
| parent | mmc: sdhci-msm: Unconditionally call dev_pm_opp_of_remove_table() (diff) | |
| parent | mmc: mmc_spi: Fix mmc_spi_dma_alloc() return type for !HAS_DMA (diff) | |
| download | linux-dev-a49e391c49c2ef3e8590030c522f195294532bad.tar.xz linux-dev-a49e391c49c2ef3e8590030c522f195294532bad.zip | |
Merge branch 'fixes' into next
| -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 419d2503472e..02f4fd26e76a 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 |