Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / drivers / media / platform / s5p-mfc / s5p_mfc_dec.c

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 4f6dd42c9adb06755eebbc520ba57124f77a5e35..8faf9691712dd8febd2c06abecd5e8b2cff29068 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -386,7 +386,7 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
                        mfc_err("Unknown codec\n");
                        return -EINVAL;
                }
-               if (!IS_MFCV6(dev)) {
+               if (!IS_MFCV6_PLUS(dev)) {
                        if (fmt->fourcc == V4L2_PIX_FMT_VP8) {
                                mfc_err("Not supported format.\n");
                                return -EINVAL;
@@ -398,10 +398,11 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
                        mfc_err("Unsupported format for destination.\n");
                        return -EINVAL;
                }
-               if (IS_MFCV6(dev) && (fmt->fourcc == V4L2_PIX_FMT_NV12MT)) {
+               if (IS_MFCV6_PLUS(dev) &&
+                               (fmt->fourcc == V4L2_PIX_FMT_NV12MT)) {
                        mfc_err("Not supported format.\n");
                        return -EINVAL;
-               } else if (!IS_MFCV6(dev) &&
+               } else if (!IS_MFCV6_PLUS(dev) &&
                                (fmt->fourcc != V4L2_PIX_FMT_NV12MT)) {
                        mfc_err("Not supported format.\n");
                        return -EINVAL;
@@ -925,7 +926,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
                psize[0] = ctx->luma_size;
                psize[1] = ctx->chroma_size;
 
-               if (IS_MFCV6(dev))
+               if (IS_MFCV6_PLUS(dev))
                        allocators[0] =
                                ctx->dev->alloc_ctx[MFC_BANK1_ALLOC_CTX];
                else
@@ -1050,7 +1051,7 @@ static int s5p_mfc_stop_streaming(struct vb2_queue *q)
                ctx->dpb_flush_flag = 1;
                ctx->dec_dst_flag = 0;
                spin_unlock_irqrestore(&dev->irqlock, flags);
-               if (IS_MFCV6(dev) && (ctx->state == MFCINST_RUNNING)) {
+               if (IS_MFCV6_PLUS(dev) && (ctx->state == MFCINST_RUNNING)) {
                        ctx->state = MFCINST_FLUSH;
                        set_work_bit_irqsave(ctx);
                        s5p_mfc_clean_ctx_int_flags(ctx);