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

Commit 6e531f10 authored by Markus Elfring's avatar Markus Elfring Committed by Mauro Carvalho Chehab
Browse files

[media] bt8xx: Delete two error messages for a failed memory allocation 

Omit extra messages for a memory allocation failure in two functions.

Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf



Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent d2180e0c

drivers/media/pci/bt8xx/dst_ca.c

+2 −4
Original line number Diff line number Diff line
@@ -481,10 +481,9 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, 
	struct ca_msg *hw_buffer;

	int result = 0;



	if ((hw_buffer = kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {

		dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");

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

	if (!hw_buffer)

		return -ENOMEM;

	}

	dprintk(verbose, DST_CA_DEBUG, 1, " ");



	if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg))) {
@@ -567,7 +566,6 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct 
	p_ca_slot_info = kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL);

	p_ca_caps = kmalloc(sizeof (struct ca_caps), GFP_KERNEL);

	if (!p_ca_message || !p_ca_slot_info || !p_ca_caps) {

		dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");

		result = -ENOMEM;

		goto free_mem_and_exit;

	}