diff --git a/drivers/amlogic/media/camera/common/cam_prober.c b/drivers/amlogic/media/camera/common/cam_prober.c index fb68a68e2721..107e95aebc1f 100644 --- a/drivers/amlogic/media/camera/common/cam_prober.c +++ b/drivers/amlogic/media/camera/common/cam_prober.c @@ -611,7 +611,7 @@ int __init gc2145_v4l2_probe(struct i2c_adapter *adapter) } #endif -#if CONFIG_AMLOGIC_VIDEO_CAPTURE_GC2145_MIPI +#ifdef CONFIG_AMLOGIC_VIDEO_CAPTURE_GC2145_MIPI int __init gc2145_mipi_v4l2_probe(struct i2c_adapter *adapter) { int ret = 0; @@ -912,7 +912,7 @@ static const struct aml_cam_dev_info_s cam_devs[] = { .probe_func = gc2145_v4l2_probe, }, #endif -#if CONFIG_AMLOGIC_VIDEO_CAPTURE_GC2145_MIPI +#ifdef CONFIG_AMLOGIC_VIDEO_CAPTURE_GC2145_MIPI { .addr = 0x3c, .name = "gc2145_mipi", diff --git a/drivers/amlogic/media/camera/gc2145_mipi.c b/drivers/amlogic/media/camera/gc2145_mipi.c index d7b7b0c880b5..837290c0eb49 100644 --- a/drivers/amlogic/media/camera/gc2145_mipi.c +++ b/drivers/amlogic/media/camera/gc2145_mipi.c @@ -2736,7 +2736,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, } set_resolution_param(dev, res_param); - + msleep(80); } else { res_param = get_resolution_param(dev, 0, fh->width, fh->height); if (!res_param) { @@ -2745,6 +2745,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, } set_resolution_param(dev, res_param); prev_res = res_param; + msleep(100); } ret = 0;