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

Commit 5bcc0dd7 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 5aa2ccfc

drivers/media/usb/go7007/go7007-fw.c

+3 −3
Original line number Diff line number Diff line
@@ -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;