Skip to content

Commit 16fc44d

Browse files
committed
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
2 parents 1fe5501 + 7412dee commit 16fc44d

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/mmc/host/meson-gx-mmc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,9 @@ static void meson_mmc_get_transfer_mode(struct mmc_host *mmc,
247247
*/
248248
for_each_sg(data->sg, sg, data->sg_len, i) {
249249
if (sg->length % data->blksz) {
250-
WARN_ONCE(1, "unaligned sg len %u blksize %u\n",
251-
sg->length, data->blksz);
250+
dev_warn_once(mmc_dev(mmc),
251+
"unaligned sg len %u blksize %u, disabling descriptor DMA for transfer\n",
252+
sg->length, data->blksz);
252253
return;
253254
}
254255
}

0 commit comments

Comments
 (0)