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 5c764f9e8a1af3138010aa09f7c192230f8af6ad..8faf9691712dd8febd2c06abecd5e8b2cff29068 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -386,10 +386,6 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
                        mfc_err("Unknown codec\n");
                        return -EINVAL;
                }
-               if (!IS_MFCV6_PLUS(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {
-                       mfc_err("Not supported format.\n");
-                       return -EINVAL;
-               }
                if (!IS_MFCV6_PLUS(dev)) {
                        if (fmt->fourcc == V4L2_PIX_FMT_VP8) {
                                mfc_err("Not supported format.\n");