Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755073Ab1FQK6Z (ORCPT ); Fri, 17 Jun 2011 06:58:25 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:39339 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753297Ab1FQK6V convert rfc822-to-8bit (ORCPT ); Fri, 17 Jun 2011 06:58:21 -0400 MIME-Version: 1.0 In-Reply-To: References: <1306360653-6196-1-git-send-email-per.forlin@linaro.org> <1306360653-6196-3-git-send-email-per.forlin@linaro.org> Date: Fri, 17 Jun 2011 12:58:20 +0200 Message-ID: Subject: Re: [PATCH v4 02/12] omap_hsmmc: use original sg_len for dma_unmap_sg From: Per Forlin To: "S, Venkatraman" Cc: linux-mmc , linux-arm-kernel , linux-kernel , linaro-dev , David Vrabel Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1992 Lines: 50 On 16 June 2011 15:16, S, Venkatraman wrote: > On Thu, May 26, 2011 at 3:27 AM, Per Forlin wrote: >> Don't use the returned sg_len from dma_map_sg() as inparameter >> to dma_unmap_sg(). Use the original sg_len for both dma_map_sg >> and dma_unmap_sg. >> >> Signed-off-by: Per Forlin >> --- >> ?drivers/mmc/host/omap_hsmmc.c | ? ?5 +++-- >> ?1 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c >> index 259ece0..ad3731a 100644 >> --- a/drivers/mmc/host/omap_hsmmc.c >> +++ b/drivers/mmc/host/omap_hsmmc.c >> @@ -959,7 +959,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); >> ? ? ? ?} >> @@ -1343,7 +1344,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; >> -- >> 1.7.4.1 >> > > Reviewed-by: Venkatraman S > > Perhaps this doesn't belong to $FEATURE and can be posted as a separate patch ? Yes, I will resend it as a separate patch. Thanks, Per -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/