Skip to content

Commit

Permalink
staging: bcm2835-camera: Fix brace style issues.
Browse files Browse the repository at this point in the history
Fix mismatched or missing brace issues flagged by checkpatch.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  • Loading branch information
6by9 authored and Phil Elwell committed May 28, 2019
1 parent 4c4e1f2 commit 8fc32fb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
Expand Up @@ -566,10 +566,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();
dev->capture.last_timestamp = 0;
Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/vc04_services/bcm2835-camera/controls.c
Expand Up @@ -410,8 +410,9 @@ 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,
Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
Expand Up @@ -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);
Expand Down

0 comments on commit 8fc32fb

Please sign in to comment.