samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: common: Fix failures in v4l2 unregister during error" into camera-kernel.lnx.4.0

Browse Source
This commit is contained in:
Camera Software Integration
2020-03-02 15:05:39 -08:00
committed by Gerrit - the friendly Code Review server
parent 3fb2481cb0 0a649b3063
commit 695e073072
10 changed files with 89 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/camera_main.c
View File

@@ -87,7 +87,7 @@ static const struct camera_submodule_component camera_isp[] = {
};
static const struct camera_submodule_component camera_tfe[] = {
#if IS_ENABLED(CONFIG_SPECTRA_TFE)
#ifdef CONFIG_SPECTRA_TFE
{&cam_top_tpg_init_module, &cam_top_tpg_exit_module},
{&cam_tfe_init_module, &cam_tfe_exit_module},
{&cam_tfe_csid530_init_module, &cam_tfe_csid530_exit_module},
@@ -384,7 +384,7 @@ static int camera_init(void)
}
}
CAM_INFO(CAM_UTIL, "Spectra camera driver initialized!");
CAM_INFO(CAM_UTIL, "Spectra camera driver initcalls done");
end_init:
return rc;