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 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[pandora-kernel.git]
/
drivers
/
media
/
common
/
saa7146_vbi.c
diff --git
a/drivers/media/common/saa7146_vbi.c
b/drivers/media/common/saa7146_vbi.c
index
8224c30
..
2d4533a
100644
(file)
--- a/
drivers/media/common/saa7146_vbi.c
+++ b/
drivers/media/common/saa7146_vbi.c
@@
-412,7
+412,7
@@
static int vbi_open(struct saa7146_dev *dev, struct file *file)
V4L2_BUF_TYPE_VBI_CAPTURE,
V4L2_FIELD_SEQ_TB, // FIXME: does this really work?
sizeof(struct saa7146_buf),
- file);
+ file
, NULL
);
init_timer(&fh->vbi_read_timeout);
fh->vbi_read_timeout.function = vbi_read_timeout;