Commit 3542cd91 authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
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>
parent e66dfacb

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

+68 −64
Original line number Diff line number Diff line
@@ -342,7 +342,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
@@ -365,14 +367,25 @@ 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) {

		/*

		 * VPU doesn't support MMAL_PARAMETER_SYSTEM_TIME, rely on

		 * kernel time, and have no latency compensation.

		 */

		buf->vb.vb2_buf.timestamp = ktime_get_ns();

		v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

			 "Buffer time set as current time - %lld",

			 buf->vb.vb2_buf.timestamp);



	} else if (pts != 0) {

		ktime_t timestamp;

		s64 runtime_us = pts -
@@ -391,11 +404,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
			v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

				 "Buffer time set as last timestamp - %lld",

				 buf->vb.vb2_buf.timestamp);

				}

				else {

		} else {

			buf->vb.vb2_buf.timestamp =

					dev->capture.kernel_start_ts.tv_sec  * 1000000000ULL +

					dev->capture.kernel_start_ts.tv_usec * 1000ULL;

				ktime_to_ns(dev->capture.kernel_start_ts);

			v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

				 "Buffer time set as start timestamp - %lld",

				 buf->vb.vb2_buf.timestamp);
@@ -416,19 +427,12 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
	    is_capturing(dev)) {

		v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

			 "Grab another frame as buffer has EOS");

				vchiq_mmal_port_parameter_set(

					instance,

		vchiq_mmal_port_parameter_set(instance,

					      dev->capture.camera_port,

					      MMAL_PARAMETER_CAPTURE,

					      &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)
@@ -822,27 +826,27 @@ 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 ret;



	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:



	return ret;

}