| Message ID | 1539356258-12374-3-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 90f835414067b104d9249e279413dfa65abb99b6 |
| Headers | show |
| Series | None | expand |
On 12 October 2018 at 16:57, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > host->chan_rx is NULL when UNIPHIER_SD_CAP_BROKEN_DMA_RX quirk flag > is set. In this case, it should not set up DMA. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied for next, thanks! Kind regards Uffe > --- > > drivers/mmc/host/uniphier-sd.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c > index 10d49aa..1ee9fd0 100644 > --- a/drivers/mmc/host/uniphier-sd.c > +++ b/drivers/mmc/host/uniphier-sd.c > @@ -251,6 +251,9 @@ static void uniphier_sd_internal_dma_start(struct tmio_mmc_host *host, > u32 dma_mode; > int sg_len; > > + if ((data->flags & MMC_DATA_READ) && !host->chan_rx) > + goto force_pio; > + > if (WARN_ON(host->sg_len != 1)) > goto force_pio; > > -- > 2.7.4 >
diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c index 10d49aa..1ee9fd0 100644 --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -251,6 +251,9 @@ static void uniphier_sd_internal_dma_start(struct tmio_mmc_host *host, u32 dma_mode; int sg_len; + if ((data->flags & MMC_DATA_READ) && !host->chan_rx) + goto force_pio; + if (WARN_ON(host->sg_len != 1)) goto force_pio;
host->chan_rx is NULL when UNIPHIER_SD_CAP_BROKEN_DMA_RX quirk flag is set. In this case, it should not set up DMA. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/mmc/host/uniphier-sd.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4