staging: bcm2835-camera: return early in mmal_setup_components (f23e128a) · Commits · 戴 / test

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

+31 −29

Original line number	Diff line number	Diff line
		@@ -1241,11 +1241,16 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
		f->fmt.pix.pixelformat);
		/* ensure capture is not going to be tried */
		dev->capture.port = NULL;
		} else {
		return ret;
		}

		if (encode_component) {
		ret = mmal_setup_encode_component(dev, f, port,
		camera_port,
		encode_component);

		if (ret)
		return ret;
		} else {
		/* configure buffering */
		camera_port->current_buffer.num = 1;
		@@ -1253,7 +1258,6 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
		camera_port->current_buffer.alignment = 0;
		}

		if (!ret) {
		dev->capture.fmt = mfmt;
		dev->capture.stride = f->fmt.pix.bytesperline;
		dev->capture.width = camera_port->es.video.crop.width;
		@@ -1270,8 +1274,6 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
		port->format.encoding,
		dev->capture.width, dev->capture.height,
		dev->capture.stride, dev->capture.buffersize);
		}
		}

		/* todo: Need to convert the vchiq/mmal error into a v4l2 error. */
		return ret;