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

Commit 2ef17c9f authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: drivers/media: Use kzalloc 

Use kzalloc rather than the combination of kmalloc and memset.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 59fd08af

drivers/media/dvb/frontends/ds3000.c

+1 −4
Original line number Diff line number Diff line
@@ -969,15 +969,12 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config, 
	dprintk("%s\n", __func__);



	/* allocate memory for the internal state */

	state = kmalloc(sizeof(struct ds3000_state), GFP_KERNEL);

	state = kzalloc(sizeof(struct ds3000_state), GFP_KERNEL);

	if (state == NULL) {

		printk(KERN_ERR "Unable to kmalloc\n");

		goto error2;

	}



	/* setup the state */

	memset(state, 0, sizeof(struct ds3000_state));



	state->config = config;

	state->i2c = i2c;

	state->prevUCBS2 = 0;

drivers/media/video/omap/omap_vout.c

+1 −2
Original line number Diff line number Diff line
@@ -2371,12 +2371,11 @@ static int __init omap_vout_create_video_devices(struct platform_device *pdev) 


	for (k = 0; k < pdev->num_resources; k++) {



		vout = kmalloc(sizeof(struct omap_vout_device), GFP_KERNEL);

		vout = kzalloc(sizeof(struct omap_vout_device), GFP_KERNEL);

		if (!vout) {

			dev_err(&pdev->dev, ": could not allocate memory\n");

			return -ENOMEM;

		}

		memset(vout, 0, sizeof(struct omap_vout_device));



		vout->vid = k;

		vid_dev->vouts[k] = vout;