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

staging: bcm2835-camera: Fix brace style issues. 



Fix mismatched or missing brace issues flagged by checkpatch.

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 eb9e4f3c

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

+2 −1
Original line number Diff line number Diff line
@@ -543,10 +543,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) 


		/* Flag to indicate just to rely on kernel timestamps */

		dev->capture.vc_start_timestamp = -1;

	} else

	} else {

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

			 "Start time %lld size %d\n",

			 dev->capture.vc_start_timestamp, parameter_size);

	}



	dev->capture.kernel_start_ts = ktime_get();

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

+2 −1
Original line number Diff line number Diff line
@@ -407,9 +407,10 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev, 
		return vchiq_mmal_port_parameter_set(dev->instance, control,

					     mmal_ctrl->mmal_id,

					     &u32_value, sizeof(u32_value));

	} else

	} else {

		return 0;

	}

}



static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev,

				      struct v4l2_ctrl *ctrl,

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

+2 −1
Original line number Diff line number Diff line
@@ -1262,9 +1262,10 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance, 
		memcpy(value, &rmsg->u.port_parameter_get_reply.value,

		       *value_size);

		*value_size = rmsg->u.port_parameter_get_reply.size;

	} else

	} else {

		memcpy(value, &rmsg->u.port_parameter_get_reply.value,

		       rmsg->u.port_parameter_get_reply.size);

	}



	pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__,

		 ret, port->component->handle, port->handle, parameter_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE