Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88ce4db3 authored by Linus Walleij's avatar Linus Walleij Committed by Chris Ball
Browse files

mmc: atmel-mci: conform to DMA-API 



Fixes the following:
- It is perfectly legal for the dma_map_sg() to return fewer
  entries than were passed in.
- Supply the returned numer of (possibly coalesced) entries to
  the device_pre_slave_sg() function.
- Use the proper original sg_len when unmapping the sglist
  in the error path.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 266ac3f2

drivers/mmc/host/atmel-mci.c

+3 −4
Original line number Diff line number Diff line
@@ -687,10 +687,9 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) 


	sglen = dma_map_sg(chan->device->dev, data->sg,

			   data->sg_len, direction);

	if (sglen != data->sg_len)

		goto unmap_exit;



	desc = chan->device->device_prep_slave_sg(chan,

			data->sg, data->sg_len, direction,

			data->sg, sglen, direction,

			DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

	if (!desc)

		goto unmap_exit;
@@ -701,7 +700,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) 


	return 0;

unmap_exit:

	dma_unmap_sg(chan->device->dev, data->sg, sglen, direction);

	dma_unmap_sg(chan->device->dev, data->sg, data->sg_len, direction);

	return -ENOMEM;

}