aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2021-04-19 09:52:08 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2021-04-19 09:52:08 +0200
commit82104edc5934955ca8571ba576f6850fec8301ae (patch)
tree3aacf306c5299610ed6f05a04f1084377a389cd6 /drivers/mmc
parentmmc: dw_mmc-rockchip: Just set default sample value for legacy mode (diff)
parentmmc: meson-gx: replace WARN_ONCE with dev_warn_once about scatterlist size alignment in block mode (diff)
downloadlinux-dev-82104edc5934955ca8571ba576f6850fec8301ae.tar.xz
linux-dev-82104edc5934955ca8571ba576f6850fec8301ae.zip
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/meson-gx-mmc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index eb6c02bc4a02..b8b771b643cc 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -247,8 +247,9 @@ static void meson_mmc_get_transfer_mode(struct mmc_host *mmc,
*/
for_each_sg(data->sg, sg, data->sg_len, i) {
if (sg->length % data->blksz) {
- WARN_ONCE(1, "unaligned sg len %u blksize %u\n",
- sg->length, data->blksz);
+ dev_warn_once(mmc_dev(mmc),
+ "unaligned sg len %u blksize %u, disabling descriptor DMA for transfer\n",
+ sg->length, data->blksz);
return;
}
}