UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] go7007: Fix returned errno code in gen_mjpeghdr_to_package() 

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>
This commit is contained in:
Javier Martinez Canillas 2015-09-16 20:55:04 -03:00 committed by Mauro Carvalho Chehab
parent 5aa2ccfc37
commit 5bcc0dd790
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/usb/go7007/go7007-fw.c
View File

@ -379,7 +379,7 @@ static int gen_mjpeghdr_to_package(struct go7007 *go, __le16 *code, int space)
buf = kzalloc(4096, GFP_KERNEL); buf = kzalloc(4096, GFP_KERNEL);
if (buf == NULL) if (buf == NULL)
return -1; return -ENOMEM;
for (i = 1; i < 32; ++i) { for (i = 1; i < 32; ++i) {
mjpeg_frame_header(go, buf + size, 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); buf = kzalloc(5120, GFP_KERNEL);
if (buf == NULL) if (buf == NULL)
return -1; return -ENOMEM;
framelen[0] = mpeg1_frame_header(go, buf, 0, 1, PFRAME); framelen[0] = mpeg1_frame_header(go, buf, 0, 1, PFRAME);
if (go->interlace_coding) if (go->interlace_coding)
@ -832,7 +832,7 @@ static int gen_mpeg4hdr_to_package(struct go7007 *go,
buf = kzalloc(5120, GFP_KERNEL); buf = kzalloc(5120, GFP_KERNEL);
if (buf == NULL) if (buf == NULL)
return -1; return -ENOMEM;
framelen[0] = mpeg4_frame_header(go, buf, 0, PFRAME); framelen[0] = mpeg4_frame_header(go, buf, 0, PFRAME);
i = 368; i = 368;