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

Commit 216f3938 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.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>

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent bc7c85e5

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

+9 −6
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, 
{

	struct sram_channel *sram_ch;

	u32 tmp;

	int retval = 0;

	int err = 0;

	int data_frame_size = 0;

	int risc_buffer_size = 0;
@@ -800,16 +799,20 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, 
		dev->_filename = kmemdup(dev->input_filename, str_length + 1,

					 GFP_KERNEL);



		if (!dev->_filename)

		if (!dev->_filename) {

			err = -ENOENT;

			goto error;

		}

	} else {

		str_length = strlen(dev->_defaultname);

		dev->_filename = kmemdup(dev->_defaultname, str_length + 1,

					 GFP_KERNEL);



		if (!dev->_filename)

		if (!dev->_filename) {

			err = -ENOENT;

			goto error;

		}

	}



	/* Default if filename is empty string */

	if (strcmp(dev->_filename, "") == 0) {
@@ -832,7 +835,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, 
	dev->_line_size = (dev->_pixel_format == PIXEL_FRMT_422) ?

		(WIDTH_D1 * 2) : (WIDTH_D1 * 3) / 2;



	retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,

	err = cx25821_sram_channel_setup_upstream(dev, sram_ch,

			dev->_line_size, 0);



	/* setup fifo + format */
@@ -842,8 +845,8 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select, 
	dev->upstream_databuf_size = data_frame_size * 2;



	/* Allocating buffers and prepare RISC program */

	retval = cx25821_upstream_buffer_prepare(dev, sram_ch, dev->_line_size);

	if (retval < 0) {

	err = cx25821_upstream_buffer_prepare(dev, sram_ch, dev->_line_size);

	if (err < 0) {

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

		       dev->name);

		goto error;