Skip to content

Fix indent that prevents kernel compilation #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2022
Merged

Fix indent that prevents kernel compilation #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/media/platform/rockchip/cif/capture.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6230,15 +6230,15 @@ static int rkcif_dvp_g_ch_id(struct v4l2_device *v4l2_dev,
if ((frm_stat & DVP_CHANNEL2_FRM_READ) ==
DVP_CHANNEL2_FRM_READ)
v4l2_warn(v4l2_dev, "frame0/1 trigger simultaneously in DVP ID2\n");
*intstat &= ~DVP_FRAME_END_ID2;
*intstat &= ~DVP_FRAME_END_ID2;
return RKCIF_STREAM_MIPI_ID2;
}

if (*intstat & DVP_FRAME_END_ID3) {
if ((frm_stat & DVP_CHANNEL3_FRM_READ) ==
DVP_CHANNEL3_FRM_READ)
v4l2_warn(v4l2_dev, "frame0/1 trigger simultaneously in DVP ID3\n");
*intstat &= ~DVP_FRAME_END_ID3;
*intstat &= ~DVP_FRAME_END_ID3;
return RKCIF_STREAM_MIPI_ID3;
}

Expand Down
4 changes: 2 additions & 2 deletions drivers/video/rockchip/rga3/rga_policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ int rga_job_assign(struct rga_job *job)
job->flags & RGA_JOB_UNSUPPORT_RGA2) {
if (DEBUGGER_EN(MSG))
pr_info("RGA2 only support under 4G memory!\n");
continue;
continue;
}

if (feature > 0) {
Expand Down Expand Up @@ -351,4 +351,4 @@ int rga_job_assign(struct rga_job *job)
pr_info("assign core: %d\n", core);

return core;
}
}