projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
video
/
videobuf-dma-contig.c
diff --git
a/drivers/media/video/videobuf-dma-contig.c
b/drivers/media/video/videobuf-dma-contig.c
index b6b5cc1a43cb9261023f52fd7c78fdb77e49066d..9b9a06fdd0f00c17249e8880e9e8f0b55211a250 100644
(file)
--- a/
drivers/media/video/videobuf-dma-contig.c
+++ b/
drivers/media/video/videobuf-dma-contig.c
@@
-40,7
+40,7
@@
struct videobuf_dma_contig_memory {
static int __videobuf_dc_alloc(struct device *dev,
struct videobuf_dma_contig_memory *mem,
static int __videobuf_dc_alloc(struct device *dev,
struct videobuf_dma_contig_memory *mem,
- unsigned long size,
unsigned long
flags)
+ unsigned long size,
gfp_t
flags)
{
mem->size = size;
if (mem->cached) {
{
mem->size = size;
if (mem->cached) {