On Wed, Nov 25, 2009 at 17:04, Andrew Morton wrote:
> --- a/drivers/mmc/host/bfin_sdh.c~blackfin-sd-host-controller-driver-fix
> +++ a/drivers/mmc/host/bfin_sdh.c
> @@ -149,15 +149,17 @@ static int sdh_setup_data(struct sdh_hos
> sdh_enable_stat_irq(host, (DAT_CRC_FAIL | DAT_TIME_OUT | DAT_END));
> host->dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
> host->dma_dir);
> #if defined(CONFIG_BF54x)
> - int i;
> dma_cfg |= DMAFLOW_ARRAY | NDSIZE_5 | RESTART | WDSIZE_32 | DMAEN;
> - for_each_sg(data->sg, sg, host->dma_len, i) {
> - host->sg_cpu[i].start_addr = sg_dma_address(sg);
> - host->sg_cpu[i].cfg = dma_cfg;
> - host->sg_cpu[i].x_count = sg_dma_len(sg) / 4;
> - host->sg_cpu[i].x_modify = 4;
> - dev_dbg(mmc_dev(host->mmc), "%d: start_addr:0x%lx, cfg:0x%x,
> x_count:0x%x,\
> - x_modify:0x%x\n", i,
> host->sg_cpu[i].start_addr,
> + {
> + int i;
> + for_each_sg(data->sg, sg, host->dma_len, i) {
> + host->sg_cpu[i].start_addr = sg_dma_address(sg);
> + host->sg_cpu[i].cfg = dma_cfg;
> + host->sg_cpu[i].x_count = sg_dma_len(sg) / 4;
> + host->sg_cpu[i].x_modify = 4;
> + dev_dbg(mmc_dev(host->mmc), "%d: start_addr:0x%lx, "
> + "cfg:0x%x, x_count:0x%x, x_modify:0x%x\n",
> + i, host->sg_cpu[i].start_addr,
> host->sg_cpu[i].cfg, host->sg_cpu[i].x_count,
> host->sg_cpu[i].x_modify);
> }
this change also has an error in it ... the new opening brace brace
stole the closing brace from the for_each_sg()
-mike
