]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] bt8xx: Delete two error messages for a failed memory allocation
authorMarkus Elfring <elfring@users.sourceforge.net>
Sat, 10 Dec 2016 19:50:58 +0000 (17:50 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 3 Feb 2017 11:19:41 +0000 (09:19 -0200)
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: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/pci/bt8xx/dst_ca.c

index 8681b9143a3521fd0457095d8d66e6eab776c566..54e656ddd588aeae4e3bc2117eafee0aae5d6640 100644 (file)
@@ -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;
        }