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

[~andy/linux] / drivers / media / platform / s5p-mfc / s5p_mfc_opr_v6.c

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index db57f2539f2d1b0ba3a429b6cb3dbb8494415691..7e76fce2e524435f301955c286d5932cbf76adb2 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1313,7 +1313,7 @@ static inline int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev)
        int cnt;
 
        spin_lock_irqsave(&dev->condlock, flags);
-       mfc_debug(2, "Previos context: %d (bits %08lx)\n", dev->curr_ctx,
+       mfc_debug(2, "Previous context: %d (bits %08lx)\n", dev->curr_ctx,
                                                        dev->ctx_work_bits);
        new_ctx = (dev->curr_ctx + 1) % MFC_NUM_CONTEXTS;
        cnt = 0;