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

staging: bcm2835-camera: Fix open parenthesis alignment

Fix checkpatch "Alignment should match open parenthesis"
errors.
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 fe78fd7b
...@@ -952,8 +952,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, ...@@ -952,8 +952,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
f->fmt.pix.bytesperline = f->fmt.pix.bytesperline =
(f->fmt.pix.bytesperline + align_mask) & ~align_mask; (f->fmt.pix.bytesperline + align_mask) & ~align_mask;
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
"Not removing padding, so bytes/line = %d, " "Not removing padding, so bytes/line = %d, (align_mask %d)\n",
"(align_mask %d)\n",
f->fmt.pix.bytesperline, align_mask); f->fmt.pix.bytesperline, align_mask);
} }
......
...@@ -1260,9 +1260,12 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev, ...@@ -1260,9 +1260,12 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev,
switch (ctrl->type) { switch (ctrl->type) {
case MMAL_CONTROL_TYPE_STD: case MMAL_CONTROL_TYPE_STD:
dev->ctrls[c] = v4l2_ctrl_new_std(hdl, dev->ctrls[c] =
&bm2835_mmal_ctrl_ops, ctrl->id, v4l2_ctrl_new_std(hdl,
ctrl->min, ctrl->max, ctrl->step, ctrl->def); &bm2835_mmal_ctrl_ops,
ctrl->id, ctrl->min,
ctrl->max, ctrl->step,
ctrl->def);
break; break;
case MMAL_CONTROL_TYPE_STD_MENU: case MMAL_CONTROL_TYPE_STD_MENU:
...@@ -1286,16 +1289,20 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev, ...@@ -1286,16 +1289,20 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev,
mask = ~mask; mask = ~mask;
} }
dev->ctrls[c] = v4l2_ctrl_new_std_menu(hdl, dev->ctrls[c] =
&bm2835_mmal_ctrl_ops, ctrl->id, v4l2_ctrl_new_std_menu(hdl,
ctrl->max, mask, ctrl->def); &bm2835_mmal_ctrl_ops,
ctrl->id, ctrl->max,
mask, ctrl->def);
break; break;
} }
case MMAL_CONTROL_TYPE_INT_MENU: case MMAL_CONTROL_TYPE_INT_MENU:
dev->ctrls[c] = v4l2_ctrl_new_int_menu(hdl, dev->ctrls[c] =
&bm2835_mmal_ctrl_ops, ctrl->id, v4l2_ctrl_new_int_menu(hdl,
ctrl->max, ctrl->def, ctrl->imenu); &bm2835_mmal_ctrl_ops,
ctrl->id, ctrl->max,
ctrl->def, ctrl->imenu);
break; break;
case MMAL_CONTROL_TYPE_CLUSTER: case MMAL_CONTROL_TYPE_CLUSTER:
......
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