]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
[media] go7007: Fix returned errno code in gen_mjpeghdr_to_package()
authorJavier Martinez Canillas <javier@osg.samsung.com>
Wed, 16 Sep 2015 23:55:04 +0000 (20:55 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 1 Oct 2015 11:32:52 +0000 (08:32 -0300)
The driver is using -1 instead of the -ENOMEM defined macro to specify
that a buffer allocation failed. Since the error number is propagated,
the caller will get a -EPERM which is the wrong error condition.

Also, the smatch tool complains with the following warning:

gen_mjpeghdr_to_package() warn: returning -1 instead of -ENOMEM is sloppy

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/go7007/go7007-fw.c

index 5f4c9b9e899aae784343f8cb93411cad2bc7d7c5..60bf5f0644d116f9d73e06b320740c0acaf5f786 100644 (file)
@@ -379,7 +379,7 @@ static int gen_mjpeghdr_to_package(struct go7007 *go, __le16 *code, int space)
 
        buf = kzalloc(4096, GFP_KERNEL);
        if (buf == NULL)
-               return -1;
+               return -ENOMEM;
 
        for (i = 1; i < 32; ++i) {
                mjpeg_frame_header(go, buf + size, i);
@@ -646,7 +646,7 @@ static int gen_mpeg1hdr_to_package(struct go7007 *go,
 
        buf = kzalloc(5120, GFP_KERNEL);
        if (buf == NULL)
-               return -1;
+               return -ENOMEM;
 
        framelen[0] = mpeg1_frame_header(go, buf, 0, 1, PFRAME);
        if (go->interlace_coding)
@@ -832,7 +832,7 @@ static int gen_mpeg4hdr_to_package(struct go7007 *go,
 
        buf = kzalloc(5120, GFP_KERNEL);
        if (buf == NULL)
-               return -1;
+               return -ENOMEM;
 
        framelen[0] = mpeg4_frame_header(go, buf, 0, PFRAME);
        i = 368;