diff options
Diffstat (limited to 'drivers/misc/carma')
| -rw-r--r-- | drivers/misc/carma/carma-fpga-program.c | 1 | ||||
| -rw-r--r-- | drivers/misc/carma/carma-fpga.c | 2 | 
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c index a2d25e4857e..eaddfe9db14 100644 --- a/drivers/misc/carma/carma-fpga-program.c +++ b/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/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c index 8c279da0741..0c43297ed9a 100644 --- a/drivers/misc/carma/carma-fpga.c +++ b/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;  |