diff --git a/[refs] b/[refs] index e9767eedafae..5114247562f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1aa60892ecc1ba03185e7dfed99cc9202ef03b7 +refs/heads/master: bb869368f36abecc427ffa94193439a05c0aac8d diff --git a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c index e43e128baf5f..90cc05855ecb 100644 --- a/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c +++ b/trunk/drivers/media/video/s5p-mfc/s5p_mfc.c @@ -475,7 +475,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx, ctx->mv_size = 0; } ctx->dpb_count = s5p_mfc_get_dpb_count(); - if (ctx->img_width == 0 || ctx->img_width == 0) + if (ctx->img_width == 0 || ctx->img_height == 0) ctx->state = MFCINST_ERROR; else ctx->state = MFCINST_HEAD_PARSED;