From 98827c23f816b73a5a753e05357f8a782c7e05e6 Mon Sep 17 00:00:00 2001 From: Per Forlin Date: Fri, 17 Jun 2011 20:14:21 +0200 Subject: [PATCH] --- yaml --- r: 254086 b: refs/heads/master c: a9120c33ffbb0b3448d833dae392edc90d6cfac2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 084d83df1cf0..8906fe4ea15f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a3dc6ef344ccfe80bf986aec0b05f51af000720 +refs/heads/master: a9120c33ffbb0b3448d833dae392edc90d6cfac2 diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index 8707bcdebc43..dedf3dab8a3b 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -961,7 +961,8 @@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno) spin_unlock(&host->irq_lock); if (host->use_dma && dma_ch != -1) { - dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, host->dma_len, + dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, + host->data->sg_len, omap_hsmmc_get_dma_dir(host, host->data)); omap_free_dma(dma_ch); } @@ -1345,7 +1346,7 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data) return; } - dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_len, + dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len, omap_hsmmc_get_dma_dir(host, data)); req_in_progress = host->req_in_progress;