V4L/DVB (8895): pvrusb2: Fail gracefully if an alien USB ID is used

[linux-2.6-omap-h63xx.git] / drivers / media / video / btcx-risc.c

diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c
index f42701f82e7fe72009bd8391672bbb40d80d306b..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);
@@ -184,12 +184,12 @@ btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips)
 }
 
 void
-btcx_calc_skips(int line, int width, unsigned int *maxy,
+btcx_calc_skips(int line, int width, int *maxy,
                struct btcx_skiplist *skips, unsigned int *nskips,
                const struct v4l2_clip *clips, unsigned int nclips)
 {
        unsigned int clip,skip;
-       int end,maxline;
+       int end, maxline;
 
        skip=0;
        maxline = 9999;