openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] s5p-mfc: use vb2_is_streaming() to check vb2 queue status 

The streaming field in struct vb2_queue is meant to be private and should
not be used by drivers directly, instead the vb2_is_streaming() function
should be used to check the videobuf2 queue streaming status.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Javier Martinez Canillas 2016-06-09 17:25:14 -03:00 committed by Mauro Carvalho Chehab
parent c8e913e19b
commit 6d2b749732
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
View File

@ -423,7 +423,7 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
pix_mp = &f->fmt.pix_mp; pix_mp = &f->fmt.pix_mp;
if (ret) if (ret)
return ret; return ret;
if (ctx->vq_src.streaming || ctx->vq_dst.streaming) { if (vb2_is_streaming(&ctx->vq_src) || vb2_is_streaming(&ctx->vq_dst)) {
v4l2_err(&dev->v4l2_dev, "%s queue busy\n", __func__); v4l2_err(&dev->v4l2_dev, "%s queue busy\n", __func__);
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@ -820,7 +820,7 @@ static int vidioc_decoder_cmd(struct file *file, void *priv,
if (cmd->flags != 0) if (cmd->flags != 0)
return -EINVAL; return -EINVAL;
if (!ctx->vq_src.streaming) if (!vb2_is_streaming(&ctx->vq_src))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&dev->irqlock, flags); spin_lock_irqsave(&dev->irqlock, flags);