diff options
| author | Hu Kejun <william.hu@rock-chips.com> | 2019-03-04 08:25:55 +0800 |
|---|---|---|
| committer | Hu Kejun <william.hu@rock-chips.com> | 2019-03-04 08:25:55 +0800 |
| commit | 17b4a53b9e0631fa42167e78b04f9f5ca6d16f14 (patch) | |
| tree | 800334702c5149b4927a6054189909a4a70f4b65 /drivers/media/platform/rockchip | |
| parent | 506c7289afb3a7198255e618a3b9c593527ae8a8 (diff) | |
media: rockchip: isp1: change readx_poll_timeout to readx_poll_timeout_atomic
rkisp1_isp_stop() is called in rkisp1_isp_isr() now,
so change readx_poll_timeout in rkisp1_isp_stop() to readx_poll_timeout_atomic
Change-Id: If4cb8628e38d2c774f30d7200b0804f22d4ccc4c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Diffstat (limited to 'drivers/media/platform/rockchip')
| -rw-r--r-- | drivers/media/platform/rockchip/isp1/rkisp1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c index 15f0f3c4b734..989bb4c9102d 100644 --- a/drivers/media/platform/rockchip/isp1/rkisp1.c +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -647,8 +647,8 @@ static int rkisp1_isp_stop(struct rkisp1_device *dev) val = readl(base + CIF_ISP_CTRL); writel(val | CIF_ISP_CTRL_ISP_CFG_UPD, base + CIF_ISP_CTRL); - readx_poll_timeout(readl, base + CIF_ISP_RIS, - val, val & CIF_ISP_OFF, 20, 100); + readx_poll_timeout_atomic(readl, base + CIF_ISP_RIS, + val, val & CIF_ISP_OFF, 20, 100); v4l2_dbg(1, rkisp1_debug, &dev->v4l2_dev, "streaming(MP:%d, SP:%d), MI_CTRL:%x, ISP_CTRL:%x, MIPI_CTRL:%x\n", dev->stream[RKISP1_STREAM_SP].streaming, |