git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
staging
/
solo6x10
/
solo6010-v4l2-enc.c
diff --git
a/drivers/staging/solo6x10/solo6010-v4l2-enc.c
b/drivers/staging/solo6x10/solo6010-v4l2-enc.c
index
bbf3d9c
..
097e82b
100644
(file)
--- a/
drivers/staging/solo6x10/solo6010-v4l2-enc.c
+++ b/
drivers/staging/solo6x10/solo6010-v4l2-enc.c
@@
-766,7
+766,7
@@
static int solo_enc_open(struct file *file)
&solo_enc->lock,
V4L2_BUF_TYPE_VIDEO_CAPTURE,
V4L2_FIELD_INTERLACED,
- sizeof(struct videobuf_buffer), fh);
+ sizeof(struct videobuf_buffer), fh
, NULL
);
spin_unlock(&solo_enc->lock);