media: zoran: add stat_com buffer

Adds the allocation of the stat_com buffer which be used later.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/zoran/zoran.h b/drivers/staging/media/zoran/zoran.h
index 87ca324f6ec2d0355984b5ba5c23b6bc49bd81a3..c73b7e7fd5e106ec425b7bdac5ddca9b46cd41d1 100644 (file)
--- a/drivers/staging/media/zoran/zoran.h
+++ b/drivers/staging/media/zoran/zoran.h
@@ -357,6 +357,8 @@ struct zoran {
        wait_queue_head_t test_q;
 
        dma_addr_t p_sc;
+       __le32 *stat_comb;
+       dma_addr_t p_scb;
 };
 
 static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)

diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
index 147bef1df33c2b210f5dd1efb9d0e3559d1c9f14..756705a34e2b82a7ca4592539f54d6049b6eb2df 100644 (file)
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -951,6 +951,14 @@ static int zr36057_init(struct zoran *zr)
        for (j = 0; j < BUZ_NUM_STAT_COM; j++)
                zr->stat_com[j] = cpu_to_le32(1); /* mark as unavailable to zr36057 */
 
+       zr->stat_comb = dma_alloc_coherent(&zr->pci_dev->dev,
+                                          BUZ_NUM_STAT_COM * sizeof(u32) * 2,
+                                          &zr->p_scb, GFP_KERNEL);
+       if (!zr->stat_comb) {
+               err = -ENOMEM;
+               goto exit_statcom;
+       }
+
        /* Now add the template and register the device unit. */
        *zr->video_dev = zoran_template;
        zr->video_dev->v4l2_dev = &zr->v4l2_dev;
@@ -964,7 +972,7 @@ static int zr36057_init(struct zoran *zr)
        zr->video_dev->vfl_dir = VFL_DIR_M2M;
        err = video_register_device(zr->video_dev, VFL_TYPE_VIDEO, video_nr[zr->id]);
        if (err < 0)
-               goto exit_statcom;
+               goto exit_statcomb;
        video_set_drvdata(zr->video_dev, zr);
 
        zoran_init_hardware(zr);
@@ -979,6 +987,8 @@ static int zr36057_init(struct zoran *zr)
        zr->initialized = 1;
        return 0;
 
+exit_statcomb:
+       dma_free_coherent(&zr->pci_dev->dev, BUZ_NUM_STAT_COM * sizeof(u32) * 2, zr->stat_comb, zr->p_scb);
 exit_statcom:
        dma_free_coherent(&zr->pci_dev->dev, BUZ_NUM_STAT_COM * sizeof(u32), zr->stat_com, zr->p_sc);
 exit_video:
@@ -1010,6 +1020,7 @@ static void zoran_remove(struct pci_dev *pdev)
        pci_free_irq(zr->pci_dev, 0, zr);
        /* unmap and free memory */
        dma_free_coherent(&zr->pci_dev->dev, BUZ_NUM_STAT_COM * sizeof(u32), zr->stat_com, zr->p_sc);
+       dma_free_coherent(&zr->pci_dev->dev, BUZ_NUM_STAT_COM * sizeof(u32) * 2, zr->stat_comb, zr->p_scb);
        pci_release_regions(pdev);
        pci_disable_device(zr->pci_dev);
        video_unregister_device(zr->video_dev);