Commit 35c586ff authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: Return early on errors 



Fix several instances where it is easier to return
early on error conditions than handle it as an else
clause. As requested by Mauro.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4979161

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+49 −45
Original line number Diff line number Diff line
@@ -334,7 +334,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
			vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);

		}

		return;

	} else if (length == 0) {

	}



	if (length == 0) {

		/* stream ended */

		if (buf) {

			/* this should only ever happen if the port is
@@ -357,8 +359,16 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
			/* signal frame completion */

			complete(&dev->capture.frame_cmplt);

		}

	} else {

		if (dev->capture.frame_count) {

		return;

	}



	if (!dev->capture.frame_count) {

		/* signal frame completion */

		vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);

		complete(&dev->capture.frame_cmplt);

		return;

	}



	if (dev->capture.vc_start_timestamp != -1 && pts) {

		ktime_t timestamp;

		s64 runtime_us = pts -
@@ -392,12 +402,6 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
			&dev->capture.frame_count,

			sizeof(dev->capture.frame_count));

	}

		} else {

			/* signal frame completion */

			vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);

			complete(&dev->capture.frame_cmplt);

		}

	}

}



static int enable_camera(struct bm2835_mmal_dev *dev)
@@ -775,28 +779,28 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on) 


	ret = vchiq_mmal_port_set_format(dev->instance, src);

	if (ret < 0)

		goto error;

		return ret;



	ret = set_overlay_params(dev, dst);

	if (ret < 0)

		goto error;

		return ret;



	if (enable_camera(dev) < 0)

		goto error;

		return -EINVAL;



	ret = vchiq_mmal_component_enable(

			dev->instance,

			dev->component[MMAL_COMPONENT_PREVIEW]);

	if (ret < 0)

		goto error;

		return ret;



	v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "connecting %p to %p\n",

		 src, dst);

	ret = vchiq_mmal_port_connect_tunnel(dev->instance, src, dst);

	if (!ret)

		ret = vchiq_mmal_port_enable(dev->instance, src, NULL);

error:

	if (ret)

		return ret;



	return vchiq_mmal_port_enable(dev->instance, src, NULL);

}



static int vidioc_g_fbuf(struct file *file, void *fh,

CRA Git | Maintained and supported by SUSTech CRA and CCSE