media: v4l: omap_vout: vrfb: initialize DMA flags
authorArnd Bergmann <arnd@arndb.de>
Wed, 26 Jul 2017 15:23:07 +0000 (11:23 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 8 Aug 2017 10:35:10 +0000 (06:35 -0400)
Passing uninitialized flags into device_prep_interleaved_dma is clearly
a bad idea, and we get a compiler warning for it:

drivers/media/platform/omap/omap_vout_vrfb.c: In function 'omap_vout_prepare_vrfb':
drivers/media/platform/omap/omap_vout_vrfb.c:273:5: error: 'flags' may be used uninitialized in this function [-Werror=maybe-uninitialized]

It seems that the OMAP dmaengine ignores the flags, but we should
pick the right ones anyway. This sets the flags I guessed based
on what other drivers used, and Peter confirmed that they are the
right ones.

Fixes: 6a1560ecaa8c ("media: v4l: omap_vout: vrfb: Convert to dmaengine")

Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/omap/omap_vout_vrfb.c

index 040eacc451687df7ff24a64fd5bec65ba7b294c0..123c2b26a93310d26cdca18f44be0616debaffe0 100644 (file)
@@ -234,7 +234,7 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout,
                           struct videobuf_buffer *vb)
 {
        struct dma_async_tx_descriptor *tx;
-       enum dma_ctrl_flags flags;
+       enum dma_ctrl_flags flags = DMA_PREP_INTERRUPT | DMA_CTRL_ACK;
        struct dma_chan *chan = vout->vrfb_dma_tx.chan;
        struct dma_device *dmadev = chan->device;
        struct dma_interleaved_template *xt = vout->vrfb_dma_tx.xt;