From 80902a97148b6dd46ad809bb679a9f44547cd5fb Mon Sep 17 00:00:00 2001 From: Vicent Chi Date: Fri, 23 Apr 2021 10:54:19 +0800 Subject: [PATCH] media: platform: cif: hotplug reset add quick stream opt Change-Id: I7934ddc2fe13cdf7fe4e0b763ba3286203c24741 Signed-off-by: Vicent Chi Signed-off-by: Zefa Chen --- drivers/media/platform/rockchip/cif/capture.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 63ffdef2a10c..36f8c26f3441 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -4752,10 +4752,8 @@ static int rkcif_do_reset_work(struct rkcif_device *cif_dev, if (p->subdevs[i] == terminal_sensor->sd) { - if (reset_src == RKCIF_RESET_SRC_ERR_HOTPLUG) - continue; - if (reset_src == RKCIF_RESET_SRC_ERR_CSI2 || + reset_src == RKCIF_RESET_SRC_ERR_HOTPLUG || reset_src == RKICF_RESET_SRC_ERR_CUTOFF) { ret = v4l2_subdev_call(p->subdevs[i], core, ioctl, @@ -4811,10 +4809,8 @@ static int rkcif_do_reset_work(struct rkcif_device *cif_dev, rkcif_csi2_set_sof(resume_info->frm_sync_seq); - if (reset_src == RKCIF_RESET_SRC_ERR_HOTPLUG) - continue; - if (reset_src == RKCIF_RESET_SRC_ERR_CSI2 || + reset_src == RKCIF_RESET_SRC_ERR_HOTPLUG || reset_src == RKICF_RESET_SRC_ERR_CUTOFF) { ret = v4l2_subdev_call(p->subdevs[i], core, ioctl, RKMODULE_SET_QUICK_STREAM, &on); @@ -4949,7 +4945,7 @@ static void rkcif_init_reset_work(struct rkcif_timer *timer) dev->reset_work.reset_src = timer->reset_src; INIT_WORK(&dev->reset_work.work, rkcif_reset_work); - if (schedule_work_on(smp_processor_id(), &dev->reset_work.work)) + if (schedule_work(&dev->reset_work.work)) v4l2_err(&dev->v4l2_dev, "schedule reset work successfully\n"); else