summaryrefslogtreecommitdiffstats
path: root/dma/ipe.c
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2015-02-06 17:35:26 +0100
committerSuren A. Chilingaryan <csa@suren.me>2015-02-06 17:35:26 +0100
commitdd2ae62a852cea5be9a98ced55c11f4fdec4cb74 (patch)
tree52f2696a3cae1af0b3db687f71fb25018f21389e /dma/ipe.c
parentd6c875d6261634e0c6f350faa942ccebbd106ed1 (diff)
downloadipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.tar.gz
ipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.tar.bz2
ipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.tar.xz
ipecamera-dd2ae62a852cea5be9a98ced55c11f4fdec4cb74.zip
Increase DMA timeout to 100ms for ipedma
Diffstat (limited to 'dma/ipe.c')
-rw-r--r--dma/ipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dma/ipe.c b/dma/ipe.c
index 7ecc153..3137ceb 100644
--- a/dma/ipe.c
+++ b/dma/ipe.c
@@ -388,7 +388,7 @@ int dma_ipe_stream_read(pcilib_dma_context_t *vctx, pcilib_dma_engine_t dma, uin
do {
switch (ret&PCILIB_STREAMING_TIMEOUT_MASK) {
case PCILIB_STREAMING_CONTINUE: wait = IPEDMA_DMA_TIMEOUT; break;
- case PCILIB_STREAMING_WAIT: wait = ((timeout<IPEDMA_DMA_TIMEOUT)?IPEDMA_DMA_TIMEOUT:timeout); break;
+ case PCILIB_STREAMING_WAIT: wait = timeout; break;
// case PCILIB_STREAMING_CHECK: wait = 0; break;
}