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

Commit eaddb093 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Mauro Carvalho Chehab
Browse files

[media] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code 

Convert a nonnegative error return code to a negative one, as returned
elsewhere in the function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

While here, replace strlen()+kmemdup() to kstrdup().

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Reviewed-by: default avatarwalter harms <wharms@bfs.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 304a0807

drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c

+12 −18
Original line number Original line Diff line number Diff line
@@ -708,11 +708,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, 
{

{

	struct sram_channel *sram_ch;

	struct sram_channel *sram_ch;

	u32 tmp;

	u32 tmp;

	int retval = 0;

	int err = 0;

	int err = 0;

	int data_frame_size = 0;

	int data_frame_size = 0;

	int risc_buffer_size = 0;

	int risc_buffer_size = 0;

	int str_length = 0;





	if (dev->_is_running_ch2) {

	if (dev->_is_running_ch2) {

		pr_info("Video Channel is still running so return!\n");

		pr_info("Video Channel is still running so return!\n");
@@ -748,19 +746,15 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, 
	risc_buffer_size = dev->_isNTSC_ch2 ?

	risc_buffer_size = dev->_isNTSC_ch2 ?

		NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;

		NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;





	if (dev->input_filename_ch2) {

	if (dev->input_filename_ch2)

		str_length = strlen(dev->input_filename_ch2);

		dev->_filename_ch2 = kstrdup(dev->input_filename_ch2,

		dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,

								GFP_KERNEL);

					     str_length + 1, GFP_KERNEL);

	else



		dev->_filename_ch2 = kstrdup(dev->_defaultname_ch2,

		if (!dev->_filename_ch2)

								GFP_KERNEL);

			goto error;

	} else {

		str_length = strlen(dev->_defaultname_ch2);

		dev->_filename_ch2 = kmemdup(dev->_defaultname_ch2,

					     str_length + 1, GFP_KERNEL);





		if (!dev->_filename_ch2)

	if (!dev->_filename_ch2) {

		err = -ENOENT;

		goto error;

		goto error;

	}

	}
@@ -777,7 +771,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, 
		}

		}

	}

	}





	retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,

	err = cx25821_sram_channel_setup_upstream(dev, sram_ch,

						dev->_line_size_ch2, 0);

						dev->_line_size_ch2, 0);





	/* setup fifo + format */

	/* setup fifo + format */
@@ -787,9 +781,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select, 
	dev->upstream_databuf_size_ch2 = data_frame_size * 2;

	dev->upstream_databuf_size_ch2 = data_frame_size * 2;





	/* Allocating buffers and prepare RISC program */

	/* Allocating buffers and prepare RISC program */

	retval = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,

	err = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,

						dev->_line_size_ch2);

						dev->_line_size_ch2);

	if (retval < 0) {

	if (err < 0) {

		pr_err("%s: Failed to set up Video upstream buffers!\n",

		pr_err("%s: Failed to set up Video upstream buffers!\n",

		       dev->name);

		       dev->name);

		goto error;

		goto error;