Commit 5db8a692 authored by Fuqian Huang's avatar Fuqian Huang Committed by Mauro Carvalho Chehab
Browse files

media: pvrusb2: use kzalloc instead of kmalloc and memset 



Replace kmalloc followed by a memset with kzalloc.

Signed-off-by: default avatarFuqian Huang <huangfq.daxian@gmail.com>
Acked-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: add pvrusb2: prefix in Subject]
[hverkuil-cisco@xs4all.nl: fix checkpatch whitespace warnings]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 5cf7e71f

drivers/media/usb/pvrusb2/pvrusb2-eeprom.c

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw) 
	int ret;

	int mode16 = 0;

	unsigned pcnt,tcnt;

	eeprom = kmalloc(EEPROM_SIZE,GFP_KERNEL);

	eeprom = kzalloc(EEPROM_SIZE, GFP_KERNEL);

	if (!eeprom) {

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "Failed to allocate memory required to read eeprom");
@@ -74,7 +74,6 @@ static u8 *pvr2_eeprom_fetch(struct pvr2_hdw *hdw) 
	   (1) we're only fetching part of the eeprom, and (2) if we were

	   getting the whole thing our I2C driver can't grab it in one

	   pass - which is what tveeprom is otherwise going to attempt */

	memset(eeprom,0,EEPROM_SIZE);

	for (tcnt = 0; tcnt < EEPROM_SIZE; tcnt += pcnt) {

		pcnt = 16;

		if (pcnt + tcnt > EEPROM_SIZE) pcnt = EEPROM_SIZE-tcnt;

drivers/media/usb/pvrusb2/pvrusb2-hdw.c

+1 −2
Original line number Diff line number Diff line
@@ -3329,7 +3329,7 @@ static u8 *pvr2_full_eeprom_fetch(struct pvr2_hdw *hdw) 
	int ret;

	int mode16 = 0;

	unsigned pcnt,tcnt;

	eeprom = kmalloc(EEPROM_SIZE,GFP_KERNEL);

	eeprom = kzalloc(EEPROM_SIZE, GFP_KERNEL);

	if (!eeprom) {

		pvr2_trace(PVR2_TRACE_ERROR_LEGS,

			   "Failed to allocate memory required to read eeprom");
@@ -3364,7 +3364,6 @@ static u8 *pvr2_full_eeprom_fetch(struct pvr2_hdw *hdw) 
	   (1) we're only fetching part of the eeprom, and (2) if we were

	   getting the whole thing our I2C driver can't grab it in one

	   pass - which is what tveeprom is otherwise going to attempt */

	memset(eeprom,0,EEPROM_SIZE);

	for (tcnt = 0; tcnt < EEPROM_SIZE; tcnt += pcnt) {

		pcnt = 16;

		if (pcnt + tcnt > EEPROM_SIZE) pcnt = EEPROM_SIZE-tcnt;