Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593195f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

parents 983d5dbd f9cfc08d

Documentation/video4linux/CARDLIST.bttv

+1 −0
Original line number Diff line number Diff line
@@ -142,3 +142,4 @@ 
141 -> Asound Skyeye PCTV

142 -> Sabrent TV-FM (bttv version)

143 -> Hauppauge ImpactVCB (bt878)                         [0070:13eb]

144 -> MagicTV

Documentation/video4linux/CARDLIST.cx88

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 18 -> Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001]

 19 -> Conexant DVB-T reference design                     [14f1:0187]

 20 -> Provideo PV259                                      [1540:2580]

 21 -> DViCO FusionHDTV DVB-T Plus                         [18ac:db10]

 21 -> DViCO FusionHDTV DVB-T Plus                         [18ac:db10,18ac:db11]

 22 -> pcHDTV HD3000 HDTV                                  [7063:3000]

 23 -> digitalnow DNTV Live! DVB-T                         [17de:a8a6]

 24 -> Hauppauge WinTV 28xxx (Roslyn) models               [0070:2801]

drivers/media/common/saa7146_core.c

+3 −6
Original line number Diff line number Diff line
@@ -109,10 +109,9 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) 
	struct page *pg;

	int i;



	sglist = kmalloc(sizeof(struct scatterlist)*nr_pages, GFP_KERNEL);

	sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL);

	if (NULL == sglist)

		return NULL;

	memset(sglist,0,sizeof(struct scatterlist)*nr_pages);

	for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) {

		pg = vmalloc_to_page(virt);

		if (NULL == pg)
@@ -306,15 +305,13 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	struct saa7146_dev *dev;

	int err = -ENOMEM;



	dev = kmalloc(sizeof(struct saa7146_dev), GFP_KERNEL);

	/* clear out mem for sure */

	dev = kzalloc(sizeof(struct saa7146_dev), GFP_KERNEL);

	if (!dev) {

		ERR(("out of memory.\n"));

		goto out;

	}



	/* clear out mem for sure */

	memset(dev, 0x0, sizeof(struct saa7146_dev));



	DEB_EE(("pci:%p\n",pci));



	err = pci_enable_device(pci);

drivers/media/common/saa7146_fops.c

+2 −4
Original line number Diff line number Diff line
@@ -239,13 +239,12 @@ static int fops_open(struct inode *inode, struct file *file) 
	}



	/* allocate per open data */

	fh = kmalloc(sizeof(*fh),GFP_KERNEL);

	fh = kzalloc(sizeof(*fh),GFP_KERNEL);

	if (NULL == fh) {

		DEB_S(("cannot allocate memory for per open data.\n"));

		result = -ENOMEM;

		goto out;

	}

	memset(fh,0,sizeof(*fh));



	file->private_data = fh;

	fh->dev = dev;
@@ -464,12 +463,11 @@ static struct video_device device_template = 


int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)

{

	struct saa7146_vv *vv = kmalloc (sizeof(struct saa7146_vv),GFP_KERNEL);

	struct saa7146_vv *vv = kzalloc (sizeof(struct saa7146_vv),GFP_KERNEL);

	if( NULL == vv ) {

		ERR(("out of memory. aborting.\n"));

		return -1;

	}

	memset(vv, 0x0, sizeof(*vv));



	DEB_EE(("dev:%p\n",dev));

drivers/media/dvb/b2c2/flexcop.c

+2 −4
Original line number Diff line number Diff line
@@ -220,20 +220,18 @@ EXPORT_SYMBOL(flexcop_reset_block_300); 
struct flexcop_device *flexcop_device_kmalloc(size_t bus_specific_len)

{

	void *bus;

	struct flexcop_device *fc = kmalloc(sizeof(struct flexcop_device), GFP_KERNEL);

	struct flexcop_device *fc = kzalloc(sizeof(struct flexcop_device), GFP_KERNEL);

	if (!fc) {

		err("no memory");

		return NULL;

	}

	memset(fc, 0, sizeof(struct flexcop_device));



	bus = kmalloc(bus_specific_len, GFP_KERNEL);

	bus = kzalloc(bus_specific_len, GFP_KERNEL);

	if (!bus) {

		err("no memory");

		kfree(fc);

		return NULL;

	}

	memset(bus, 0, bus_specific_len);



	fc->bus_specific = bus;