Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5935caec authored by Aybuke Ozdemir's avatar Aybuke Ozdemir Committed by Peter P Waskiewicz Jr
Browse files

staging: go7007: go7007-v4l2.c Fix line over 80 characters. 



Fix checkpatch.pl issues with line over
80 characters in go7007-v4l2.c

Signed-off-by: default avatarAybuke Ozdemir <aybuke.147@gmail.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent de82a6db

drivers/staging/media/go7007/go7007-v4l2.c

+13 −7
Original line number Original line Diff line number Diff line
@@ -433,7 +433,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 
	return set_capture_size(go, fmt, 0);

	return set_capture_size(go, fmt, 0);

}

}





static int go7007_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,

static int go7007_queue_setup(struct vb2_queue *q,

		const struct v4l2_format *fmt,

		unsigned int *num_buffers, unsigned int *num_planes,

		unsigned int *num_buffers, unsigned int *num_planes,

		unsigned int sizes[], void *alloc_ctxs[])

		unsigned int sizes[], void *alloc_ctxs[])

{

{
@@ -737,7 +738,8 @@ static int vidioc_enumaudio(struct file *file, void *fh, struct v4l2_audio *a) 




	if (a->index >= go->board_info->num_aud_inputs)

	if (a->index >= go->board_info->num_aud_inputs)

		return -EINVAL;

		return -EINVAL;

	strlcpy(a->name, go->board_info->aud_inputs[a->index].name, sizeof(a->name));

	strlcpy(a->name, go->board_info->aud_inputs[a->index].name,

		sizeof(a->name));

	a->capability = V4L2_AUDCAP_STEREO;

	a->capability = V4L2_AUDCAP_STEREO;

	return 0;

	return 0;

}

}
@@ -747,12 +749,14 @@ static int vidioc_g_audio(struct file *file, void *fh, struct v4l2_audio *a) 
	struct go7007 *go = video_drvdata(file);

	struct go7007 *go = video_drvdata(file);





	a->index = go->aud_input;

	a->index = go->aud_input;

	strlcpy(a->name, go->board_info->aud_inputs[go->aud_input].name, sizeof(a->name));

	strlcpy(a->name, go->board_info->aud_inputs[go->aud_input].name,

		sizeof(a->name));

	a->capability = V4L2_AUDCAP_STEREO;

	a->capability = V4L2_AUDCAP_STEREO;

	return 0;

	return 0;

}

}





static int vidioc_s_audio(struct file *file, void *fh, const struct v4l2_audio *a)

static int vidioc_s_audio(struct file *file, void *fh,

	const struct v4l2_audio *a)

{

{

	struct go7007 *go = video_drvdata(file);

	struct go7007 *go = video_drvdata(file);
@@ -960,8 +964,10 @@ int go7007_v4l2_ctrl_init(struct go7007 *go) 
			V4L2_MPEG_VIDEO_ASPECT_1x1);

			V4L2_MPEG_VIDEO_ASPECT_1x1);

	ctrl = v4l2_ctrl_new_std(hdl, NULL,

	ctrl = v4l2_ctrl_new_std(hdl, NULL,

			V4L2_CID_JPEG_ACTIVE_MARKER, 0,

			V4L2_CID_JPEG_ACTIVE_MARKER, 0,

			V4L2_JPEG_ACTIVE_MARKER_DQT | V4L2_JPEG_ACTIVE_MARKER_DHT, 0,

			V4L2_JPEG_ACTIVE_MARKER_DQT |

			V4L2_JPEG_ACTIVE_MARKER_DQT | V4L2_JPEG_ACTIVE_MARKER_DHT);

			V4L2_JPEG_ACTIVE_MARKER_DHT, 0,

			V4L2_JPEG_ACTIVE_MARKER_DQT |

			V4L2_JPEG_ACTIVE_MARKER_DHT);

	if (ctrl)

	if (ctrl)

		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;

		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;

	if (hdl->error) {

	if (hdl->error) {