summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/soc_camera/tegra_camera/common.c1
-rw-r--r--drivers/media/platform/soc_camera/tegra_camera/vi2.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/tegra_camera/common.c b/drivers/media/platform/soc_camera/tegra_camera/common.c
index 3bbceced0ade..370035f1e824 100644
--- a/drivers/media/platform/soc_camera/tegra_camera/common.c
+++ b/drivers/media/platform/soc_camera/tegra_camera/common.c
@@ -199,6 +199,7 @@ static void tegra_camera_deactivate(struct tegra_camera_dev *cam)
nvhost_module_idle_ext(cam->ndev);
cam->sof = 0;
+ cam->cal_done = 0;
}
static int tegra_camera_capture_frame(struct tegra_camera_dev *cam)
diff --git a/drivers/media/platform/soc_camera/tegra_camera/vi2.c b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
index 3f3b8bfc7d9b..6825de92e5e8 100644
--- a/drivers/media/platform/soc_camera/tegra_camera/vi2.c
+++ b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
@@ -1100,7 +1100,7 @@ static int vi2_mipi_calibration(struct tegra_camera_dev *cam)
regmap_update_bits(regs, CILC_MIPI_CAL_CONFIG_2, CLKSELC, 0);
regmap_update_bits(regs, CILD_MIPI_CAL_CONFIG, SELD, 0);
regmap_update_bits(regs, CILD_MIPI_CAL_CONFIG_2, CLKSELD, 0);
- regmap_update_bits(regs, CILC_MIPI_CAL_CONFIG, SELE, 0);
+ regmap_update_bits(regs, CILE_MIPI_CAL_CONFIG, SELE, 0);
regmap_update_bits(regs, CSIE_MIPI_CAL_CONFIG_2, CLKSELE, 0);
/* Select the CIL pad for auto calibration */