Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / btcx-risc.c

diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c
index 3324ab38f58c3b395f617e00c9a9c4bd957ff820..ac1b2687a20d7feca68b8ebce0758b0c5e29411c 100644 (file)
--- a/drivers/media/video/btcx-risc.c
+++ b/drivers/media/video/btcx-risc.c
@@ -64,7 +64,7 @@ int btcx_riscmem_alloc(struct pci_dev *pci,
                       unsigned int size)
 {
        __le32 *cpu;
-       dma_addr_t dma;
+       dma_addr_t dma = 0;
 
        if (NULL != risc->cpu && risc->size < size)
                btcx_riscmem_free(pci,risc);