From 9b70b6b5c7bc8782ee5f34ed1aeb65be5ac47706 Mon Sep 17 00:00:00 2001 From: Qiang Liu Date: Thu, 9 Aug 2012 16:23:31 +0800 Subject: [PATCH] --- yaml --- r: 324323 b: refs/heads/master c: 567fd1d4a66a2d6e5599be0ada582e0a3dbd23d4 h: refs/heads/master i: 324321: b2035df2c881f57c3442bd884d6fd3cf443001af 324319: 6190633bb7e59e588daae7ef23b0c0d2ade13508 v: v3 --- [refs] | 2 +- trunk/drivers/misc/carma/carma-fpga-program.c | 1 - trunk/drivers/misc/carma/carma-fpga.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6df14cf7026f..9e9ca5622d80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfeb28525faa855b7f0bd06a330a6961f4c5127e +refs/heads/master: 567fd1d4a66a2d6e5599be0ada582e0a3dbd23d4 diff --git a/trunk/drivers/misc/carma/carma-fpga-program.c b/trunk/drivers/misc/carma/carma-fpga-program.c index a2d25e4857e3..eaddfe9db149 100644 --- a/trunk/drivers/misc/carma/carma-fpga-program.c +++ b/trunk/drivers/misc/carma/carma-fpga-program.c @@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op) dev_set_drvdata(priv->dev, priv); dma_cap_zero(mask); dma_cap_set(DMA_MEMCPY, mask); - dma_cap_set(DMA_INTERRUPT, mask); dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SG, mask); diff --git a/trunk/drivers/misc/carma/carma-fpga.c b/trunk/drivers/misc/carma/carma-fpga.c index 8c279da07410..0c43297ed9ac 100644 --- a/trunk/drivers/misc/carma/carma-fpga.c +++ b/trunk/drivers/misc/carma/carma-fpga.c @@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf) src = SYS_FPGA_BLOCK; tx = chan->device->device_prep_dma_memcpy(chan, dst, src, REG_BLOCK_SIZE, - DMA_PREP_INTERRUPT); + 0); if (!tx) { dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n"); return -ENOMEM;