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

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
...@@ -543,10 +543,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -543,10 +543,11 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
/* Flag to indicate just to rely on kernel timestamps */ /* Flag to indicate just to rely on kernel timestamps */
dev->capture.vc_start_timestamp = -1; dev->capture.vc_start_timestamp = -1;
} else } else {
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
"Start time %lld size %d\n", "Start time %lld size %d\n",
dev->capture.vc_start_timestamp, parameter_size); dev->capture.vc_start_timestamp, parameter_size);
}
dev->capture.kernel_start_ts = ktime_get(); dev->capture.kernel_start_ts = ktime_get();
......
...@@ -407,8 +407,9 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev, ...@@ -407,8 +407,9 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
return vchiq_mmal_port_parameter_set(dev->instance, control, return vchiq_mmal_port_parameter_set(dev->instance, control,
mmal_ctrl->mmal_id, mmal_ctrl->mmal_id,
&u32_value, sizeof(u32_value)); &u32_value, sizeof(u32_value));
} else } else {
return 0; return 0;
}
} }
static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev, static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev,
......
...@@ -1262,9 +1262,10 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance, ...@@ -1262,9 +1262,10 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance,
memcpy(value, &rmsg->u.port_parameter_get_reply.value, memcpy(value, &rmsg->u.port_parameter_get_reply.value,
*value_size); *value_size);
*value_size = rmsg->u.port_parameter_get_reply.size; *value_size = rmsg->u.port_parameter_get_reply.size;
} else } else {
memcpy(value, &rmsg->u.port_parameter_get_reply.value, memcpy(value, &rmsg->u.port_parameter_get_reply.value,
rmsg->u.port_parameter_get_reply.size); rmsg->u.port_parameter_get_reply.size);
}
pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__, pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__,
ret, port->component->handle, port->handle, parameter_id); ret, port->component->handle, port->handle, parameter_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment