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

media: rockchip: rkisp1: cleanup buffers if start stream failed

Browse Source 
This fix the warning:
[  109.292738] WARNING: at drivers/media/v4l2-core/videobuf2-core.c:1313
if start streaming failed.

Change-Id: Ieaff518836382121d0c79c86c57e90a8e6b97296
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
This commit is contained in:
Shunqian Zheng
2019-08-23 03:15:50 +00:00
committed by Hu Kejun
parent 9533520782
commit 4318ff8e62
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/rockchip/isp1/capture.c
View File

@@ -1499,6 +1499,7 @@ rkisp1_start_streaming(struct vb2_queue *queue, unsigned int count)
struct rkisp1_device *dev = stream->ispdev;
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
int ret;
unsigned int i;
if (WARN_ON(stream->streaming))
return -EBUSY;
@@ -1510,7 +1511,7 @@ rkisp1_start_streaming(struct vb2_queue *queue, unsigned int count)
v4l2_err(v4l2_dev,
"update sensor info failed %d\n",
ret);
return ret;
goto buffer_done;
}
}
@@ -1520,7 +1521,8 @@ rkisp1_start_streaming(struct vb2_queue *queue, unsigned int count)
if (stream->id != RKISP1_STREAM_SP) {
v4l2_err(v4l2_dev,
"only selfpath support interlaced\n");
return -EINVAL;
ret = -EINVAL;
goto buffer_done;
}
stream->interlaced = true;
stream->u.sp.field = RKISP_FIELD_INVAL;
@@ -1529,7 +1531,7 @@ rkisp1_start_streaming(struct vb2_queue *queue, unsigned int count)
ret = rkisp1_create_dummy_buf(stream);
if (ret < 0)
return ret;
goto buffer_done;
/* enable clocks/power-domains */
ret = dev->pipe.open(&dev->pipe, &node->vdev.entity, true);
@@ -1566,6 +1568,14 @@ close_pipe:
dev->pipe.close(&dev->pipe);
destroy_dummy_buf:
rkisp1_destroy_dummy_buf(stream);
buffer_done:
for (i = 0; i < queue->num_buffers; ++i) {
struct vb2_buffer *vb;
vb = queue->bufs[i];
if (vb->state == VB2_BUF_STATE_ACTIVE)
vb2_buffer_done(vb, VB2_BUF_STATE_QUEUED);
}
return ret;
}