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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
media
/
video
/
pvrusb2
/
pvrusb2-hdw.c
diff --git
a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index
712b300
..
301ef19
100644
(file)
--- a/
drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/
drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@
-2028,7
+2028,7
@@
static void pvr2_hdw_cx25840_vbi_hack(struct pvr2_hdw *hdw)
memset(&fmt, 0, sizeof(fmt));
fmt.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
v4l2_device_call_all(&hdw->v4l2_dev, hdw->decoder_client_id,
- v
ideo, s_fmt, &fmt
);
+ v
bi, s_sliced_fmt, &fmt.fmt.sliced
);
}