shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: vicap fix bug of tasklet disable when tasklet not enable

Browse Source 
Change-Id: Ibf700123ace0227990b68b01d0919034ecb53904
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
This commit is contained in:
Jianwei Fan
2024-06-20 17:53:03 +08:00
committed by Tao Huang
parent fc5d560717
commit faf5d48659
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/platform/rockchip/cif/capture.c
View File

@@ -7408,7 +7408,7 @@ int rkcif_do_start_stream(struct rkcif_stream *stream, enum rkcif_stream_mode mo
if (ret < 0) {
v4l2_err(v4l2_dev, "open cif pipeline failed %d\n",
ret);
goto destroy_buf;
goto disable_tasklet;
}
/*
@@ -7421,7 +7421,7 @@ int rkcif_do_start_stream(struct rkcif_stream *stream, enum rkcif_stream_mode mo
rkmodule_stream_seq == RKMODULE_START_STREAM_FRONT) {
ret = dev->pipe.set_stream(&dev->pipe, true);
if (ret < 0)
goto destroy_buf;
goto disable_tasklet;
}
ret = v4l2_subdev_call(terminal_sensor->sd,
core, ioctl,
@@ -7445,7 +7445,7 @@ int rkcif_do_start_stream(struct rkcif_stream *stream, enum rkcif_stream_mode mo
ret = rkcif_stream_start(stream, mode);
}
if (ret < 0)
goto destroy_buf;
goto disable_tasklet;
if (stream->cur_stream_mode == RKCIF_STREAM_MODE_NONE &&
dev->channels[0].capture_info.mode == RKMODULE_ONE_CH_TO_MULTI_ISP &&
stream->id == 0) {
@@ -7507,9 +7507,10 @@ stop_stream:
pipe_stream_off:
dev->pipe.set_stream(&dev->pipe, false);
destroy_buf:
disable_tasklet:
if (mode == RKCIF_STREAM_MODE_CAPTURE)
tasklet_disable(&stream->vb_done_tasklet);
destroy_buf:
if (stream->curr_buf)
list_add_tail(&stream->curr_buf->queue, &stream->buf_head);
if (stream->next_buf &&