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 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
drivers
/
staging
/
solo6x10
/
solo6010-v4l2.c
diff --git
a/drivers/staging/solo6x10/solo6010-v4l2.c
b/drivers/staging/solo6x10/solo6010-v4l2.c
index
9731fa0
..
6ffd21d
100644
(file)
--- a/
drivers/staging/solo6x10/solo6010-v4l2.c
+++ b/
drivers/staging/solo6x10/solo6010-v4l2.c
@@
-437,7
+437,7
@@
static int solo_v4l2_open(struct file *file)
&solo_dev->pdev->dev, &fh->slock,
V4L2_BUF_TYPE_VIDEO_CAPTURE,
SOLO_DISP_PIX_FIELD,
- sizeof(struct videobuf_buffer), fh);
+ sizeof(struct videobuf_buffer), fh
, NULL
);
return 0;
}