From afac19651ec4690dfa28fd6e760ef06300b67455 Mon Sep 17 00:00:00 2001 From: Kamil Debski Date: Fri, 20 Jul 2012 11:28:03 -0300 Subject: [PATCH] --- yaml --- r: 331200 b: refs/heads/master c: 3f14513d0a825ba0c2f2c4227af2bac4f864a9e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cfd83983be51..5b2ccd9f6549 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d33ee92ac2556ab1e53db4644af672e2e136013 +refs/heads/master: 3f14513d0a825ba0c2f2c4227af2bac4f864a9e0 diff --git a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 4d662f1c4acc..992303d76b11 100644 --- a/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/trunk/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c @@ -78,7 +78,7 @@ int s5p_mfc_alloc_and_load_firmware(struct s5p_mfc_dev *dev) } dev->bank1 = s5p_mfc_bitproc_phys; b_base = vb2_dma_contig_memops.alloc( - dev->alloc_ctx[MFC_BANK2_ALLOC_CTX], 1 << MFC_BANK2_ALIGN_ORDER); + dev->alloc_ctx[MFC_BANK2_ALLOC_CTX], 1 << MFC_BASE_ALIGN_ORDER); if (IS_ERR(b_base)) { vb2_dma_contig_memops.put(s5p_mfc_bitproc_buf); s5p_mfc_bitproc_phys = 0;