Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/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 47c997d9e8cbfbff09a53bac1f8d041a9292acf6..52081ddc9bf249f990c89f386f602e75a8edb378 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -776,11 +776,12 @@ static int vidioc_g_crop(struct file *file, void *priv,
        u32 left, right, top, bottom;
 
        if (ctx->state != MFCINST_HEAD_PARSED &&
-       ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
-                                       && ctx->state != MFCINST_FINISHED) {
-                       mfc_err("Cannont set crop\n");
-                       return -EINVAL;
-               }
+           ctx->state != MFCINST_RUNNING &&
+           ctx->state != MFCINST_FINISHING &&
+           ctx->state != MFCINST_FINISHED) {
+               mfc_err("Can not get crop information\n");
+               return -EINVAL;
+       }
        if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_H264) {
                left = s5p_mfc_hw_call(dev->mfc_ops, get_crop_info_h, ctx);
                right = left >> S5P_FIMV_SHARED_CROP_RIGHT_SHIFT;