git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
video
/
mem2mem_testdev.c
diff --git
a/drivers/media/video/mem2mem_testdev.c
b/drivers/media/video/mem2mem_testdev.c
index 554eaf140128dd4abdb7fe033305a3f388ada55b..10ddeccc70ebee17045ad57cd4f8af1248223b00 100644
(file)
--- a/
drivers/media/video/mem2mem_testdev.c
+++ b/
drivers/media/video/mem2mem_testdev.c
@@
-988,6
+988,9
@@
static int m2mtest_probe(struct platform_device *pdev)
goto err_m2m;
}
+ q_data[V4L2_M2M_SRC].fmt = &formats[0];
+ q_data[V4L2_M2M_DST].fmt = &formats[0];
+
return 0;
err_m2m: