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 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
platform
/
mx2_emmaprp.c
diff --git
a/drivers/media/platform/mx2_emmaprp.c
b/drivers/media/platform/mx2_emmaprp.c
index b7cea274d7ea178d2c2448bac44b5baf49c291a2..03a1b606655df8cf81cafea470d600107be58e05 100644
(file)
--- a/
drivers/media/platform/mx2_emmaprp.c
+++ b/
drivers/media/platform/mx2_emmaprp.c
@@
-689,7
+689,7
@@
static const struct v4l2_ioctl_ops emmaprp_ioctl_ops = {
* Queue operations
*/
static int emmaprp_queue_setup(struct vb2_queue *vq,
- const
struct v4l2_format *fmt
,
+ const
void *parg
,
unsigned int *nbuffers, unsigned int *nplanes,
unsigned int sizes[], void *alloc_ctxs[])
{