From 60ad0d08e1c231711ad8c27d7e99dbd760bf24ff Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Fri, 6 May 2011 12:14:11 +0300 Subject: [PATCH] --- yaml --- r: 255235 b: refs/heads/master c: 770d7432009c8bc89cf72d47313866adf600c66a h: refs/heads/master i: 255233: 0a4f3171087cce6dd97d6c6d26d950bffdfcfaeb 255231: 76aa8642412f93091f11f9cda7c46e02afc2b287 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 84a32766472c..841b8a6e8788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3796fb8ac40920e04ed36e45b1b40d13aec3909d +refs/heads/master: 770d7432009c8bc89cf72d47313866adf600c66a diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index f82a0535afd1..21e4a799df48 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -1369,7 +1369,7 @@ static void omap_hsmmc_config_dma_params(struct omap_hsmmc_host *host, static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data) { struct omap_hsmmc_host *host = cb_data; - struct mmc_data *data = host->mrq->data; + struct mmc_data *data; int dma_ch, req_in_progress; if (!(ch_status & OMAP_DMA_BLOCK_IRQ)) { @@ -1384,6 +1384,7 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data) return; } + data = host->mrq->data; host->dma_sg_idx++; if (host->dma_sg_idx < host->dma_len) { /* Fire up the next transfer. */