Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330542
b: refs/heads/master
c: 2a7357c
h: refs/heads/master
v: v3
  • Loading branch information
Kamil Debski authored and Mauro Carvalho Chehab committed Sep 15, 2012
1 parent a781737 commit 767d171
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4cdef22480bffe31966b1202ef9c53f46848c469
refs/heads/master: 2a7357c7abc176d9ba6311c9a5e82af4bd980a4f
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 767d171

Please sign in to comment.