Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / drivers / media / common / saa7146 / saa7146_fops.c

diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index d9e1d6395ed9499f2df0e681bfa04b46b3d1adfe..6c47f3fe9b0fc2ba2f8eb9263a2f0e9d0396d870 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -520,14 +520,15 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
           configuration data) */
        dev->ext_vv_data = ext_vv;
 
-       vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
+       vv->d_clipping.cpu_addr =
+               pci_zalloc_consistent(dev->pci, SAA7146_CLIPPING_MEM,
+                                     &vv->d_clipping.dma_handle);
        if( NULL == vv->d_clipping.cpu_addr ) {
                ERR("out of memory. aborting.\n");
                kfree(vv);
                v4l2_ctrl_handler_free(hdl);
                return -1;
        }
-       memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM);
 
        saa7146_video_uops.init(dev,vv);
        if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)