Commit 16fc44d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1fe5501b 7412dee9

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

+3 −2
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ 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",

				dev_warn_once(mmc_dev(mmc),

					      "unaligned sg len %u blksize %u, disabling descriptor DMA for transfer\n",

					      sg->length, data->blksz);

				return;

			}