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

Commit e5789608 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Ulf Hansson
Browse files

mmc: omap_hsmmc: Initialize dma_slave_config to avoid random data 



It is wrong to use uninitialized dma_slave_config and configure only
certain fields as the DMAengine driver might look at non initialized
(random data) fields and tries to interpret it.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3ae50f45

drivers/mmc/host/omap_hsmmc.c

+8 −8
Original line number Diff line number Diff line
@@ -1409,11 +1409,18 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host, 
static int omap_hsmmc_setup_dma_transfer(struct omap_hsmmc_host *host,

					struct mmc_request *req)

{

	struct dma_slave_config cfg;

	struct dma_async_tx_descriptor *tx;

	int ret = 0, i;

	struct mmc_data *data = req->data;

	struct dma_chan *chan;

	struct dma_slave_config cfg = {

		.src_addr = host->mapbase + OMAP_HSMMC_DATA,

		.dst_addr = host->mapbase + OMAP_HSMMC_DATA,

		.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,

		.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,

		.src_maxburst = data->blksz / 4,

		.dst_maxburst = data->blksz / 4,

	};



	/* Sanity check: all the SG entries must be aligned by block size. */

	for (i = 0; i < data->sg_len; i++) {
@@ -1433,13 +1440,6 @@ static int omap_hsmmc_setup_dma_transfer(struct omap_hsmmc_host *host, 


	chan = omap_hsmmc_get_dma_chan(host, data);



	cfg.src_addr = host->mapbase + OMAP_HSMMC_DATA;

	cfg.dst_addr = host->mapbase + OMAP_HSMMC_DATA;

	cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	cfg.src_maxburst = data->blksz / 4;

	cfg.dst_maxburst = data->blksz / 4;



	ret = dmaengine_slave_config(chan, &cfg);

	if (ret)

		return ret;