diff options
| author | Linus Torvalds | 2021-04-21 10:22:54 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-04-21 10:22:54 -0700 |
| commit | 16fc44d6387e260f4932e9248b985837324705d8 (patch) | |
| tree | 21ab55520c6eed6c78801a6f90444793f3abc56b | |
| parent | 1fe5501ba1abf2b7e78295df73675423bd6899a0 (diff) | |
| parent | 7412dee9f1fd3e224202b633fdfa6eeaebe0307e (diff) | |
Merge tag 'mmc-v5.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fix from Ulf Hansson:
"Replace WARN_ONCE with dev_warn_once for non-optimal sg-alignment in
the meson-gx host driver"
* tag 'mmc-v5.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: meson-gx: replace WARN_ONCE with dev_warn_once about scatterlist size alignment in block mode
| -rw-r--r-- | drivers/mmc/host/meson-gx-mmc.c | 5 |
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; } } |