diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 04:24:38 -0500 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-11-17 04:24:57 -0500 |
| commit | e0d23ef29ed637dc6bd739f590985746d9ad9caa (patch) | |
| tree | c5b5856dc88582697997bb10ccacad6fc2535465 /drivers/misc | |
| parent | ca7fe2db892dcf91b2c72ee352eda4ff867903a7 (diff) | |
| parent | 55ba4e5ed4ac57b60fe56acfd324f6a87123cc34 (diff) | |
Merge branch 'dma_slave_direction' into next_test_dirn
resolved conflicts:
drivers/media/video/mx3_camera.c
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/carma/carma-fpga-program.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c index 7ce6065dc20e..20ef1eac5599 100644 --- a/drivers/misc/carma/carma-fpga-program.c +++ b/drivers/misc/carma/carma-fpga-program.c | |||
| @@ -513,7 +513,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv) | |||
| 513 | * transaction, and then put it under external control | 513 | * transaction, and then put it under external control |
| 514 | */ | 514 | */ |
| 515 | memset(&config, 0, sizeof(config)); | 515 | memset(&config, 0, sizeof(config)); |
| 516 | config.direction = DMA_TO_DEVICE; | 516 | config.direction = DMA_MEM_TO_DEV; |
| 517 | config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | 517 | config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; |
| 518 | config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4; | 518 | config.dst_maxburst = fpga_fifo_size(priv->regs) / 2 / 4; |
| 519 | ret = chan->device->device_control(chan, DMA_SLAVE_CONFIG, | 519 | ret = chan->device->device_control(chan, DMA_SLAVE_CONFIG, |