projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iio: adc: stm32-adc: fix stopping dma
[linux-2.6-microblaze.git]
/
drivers
/
iio
/
adc
/
stm32-adc.c
diff --git
a/drivers/iio/adc/stm32-adc.c
b/drivers/iio/adc/stm32-adc.c
index
663f8a5
..
73aee59
100644
(file)
--- a/
drivers/iio/adc/stm32-adc.c
+++ b/
drivers/iio/adc/stm32-adc.c
@@
-1399,7
+1399,7
@@
static int stm32_adc_dma_start(struct iio_dev *indio_dev)
cookie = dmaengine_submit(desc);
ret = dma_submit_error(cookie);
if (ret) {
cookie = dmaengine_submit(desc);
ret = dma_submit_error(cookie);
if (ret) {
- dmaengine_terminate_
all
(adc->dma_chan);
+ dmaengine_terminate_
sync
(adc->dma_chan);
return ret;
}
return ret;
}
@@
-1477,7
+1477,7
@@
static void __stm32_adc_buffer_predisable(struct iio_dev *indio_dev)
stm32_adc_conv_irq_disable(adc);
if (adc->dma_chan)
stm32_adc_conv_irq_disable(adc);
if (adc->dma_chan)
- dmaengine_terminate_
all
(adc->dma_chan);
+ dmaengine_terminate_
sync
(adc->dma_chan);
if (stm32_adc_set_trig(indio_dev, NULL))
dev_err(&indio_dev->dev, "Can't clear trigger\n");
if (stm32_adc_set_trig(indio_dev, NULL))
dev_err(&indio_dev->dev, "Can't clear trigger\n");