From 5f8e7835e8044cbca8d00c60c20806777b6c3689 Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Fri, 14 Oct 2011 10:42:56 +0530 Subject: [PATCH] --- yaml --- r: 286104 b: refs/heads/master c: 1d0c81e876fe04295ef5df387ba057bf9cfae3d8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/carma/carma-fpga-program.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72fbdf45d10f..bdd222e0bad3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1003cab8276cd34d9deab8ca9d148ee59f7728a7 +refs/heads/master: 1d0c81e876fe04295ef5df387ba057bf9cfae3d8 diff --git a/trunk/drivers/misc/carma/carma-fpga-program.c b/trunk/drivers/misc/carma/carma-fpga-program.c index 7ce6065dc20e..20ef1eac5599 100644 --- a/trunk/drivers/misc/carma/carma-fpga-program.c +++ b/trunk/drivers/misc/carma/carma-fpga-program.c @@ -513,7 +513,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv) * transaction, and then put it under external control */ memset(&config, 0, sizeof(config)); - config.direction = DMA_TO_DEVICE; + config.direction = DMA_MEM_TO_DEV; config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4; ret = chan->device->device_control(chan, DMA_SLAVE_CONFIG,