Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
usb
/
au0828
/
au0828-vbi.c
diff --git
a/kernel/drivers/media/usb/au0828/au0828-vbi.c
b/kernel/drivers/media/usb/au0828/au0828-vbi.c
index
f67247c
..
130c8b4
100644
(file)
--- a/
kernel/drivers/media/usb/au0828/au0828-vbi.c
+++ b/
kernel/drivers/media/usb/au0828/au0828-vbi.c
@@
-30,10
+30,11
@@
/* ------------------------------------------------------------------ */
/* ------------------------------------------------------------------ */
-static int vbi_queue_setup(struct vb2_queue *vq, const
struct v4l2_format *fmt
,
+static int vbi_queue_setup(struct vb2_queue *vq, const
void *parg
,
unsigned int *nbuffers, unsigned int *nplanes,
unsigned int sizes[], void *alloc_ctxs[])
{
unsigned int *nbuffers, unsigned int *nplanes,
unsigned int sizes[], void *alloc_ctxs[])
{
+ const struct v4l2_format *fmt = parg;
struct au0828_dev *dev = vb2_get_drv_priv(vq);
unsigned long img_size = dev->vbi_width * dev->vbi_height * 2;
unsigned long size;
struct au0828_dev *dev = vb2_get_drv_priv(vq);
unsigned long img_size = dev->vbi_width * dev->vbi_height * 2;
unsigned long size;
@@
-52,7
+53,6
@@
static int vbi_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
static int vbi_buffer_prepare(struct vb2_buffer *vb)
{
struct au0828_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
static int vbi_buffer_prepare(struct vb2_buffer *vb)
{
struct au0828_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
- struct au0828_buffer *buf = container_of(vb, struct au0828_buffer, vb);
unsigned long size;
size = dev->vbi_width * dev->vbi_height * 2;
unsigned long size;
size = dev->vbi_width * dev->vbi_height * 2;
@@
-62,7
+62,7
@@
static int vbi_buffer_prepare(struct vb2_buffer *vb)
__func__, vb2_plane_size(vb, 0), size);
return -EINVAL;
}
__func__, vb2_plane_size(vb, 0), size);
return -EINVAL;
}
- vb2_set_plane_payload(
&buf->
vb, 0, size);
+ vb2_set_plane_payload(vb, 0, size);
return 0;
}
return 0;
}
@@
-71,7
+71,9
@@
static void
vbi_buffer_queue(struct vb2_buffer *vb)
{
struct au0828_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
vbi_buffer_queue(struct vb2_buffer *vb)
{
struct au0828_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
- struct au0828_buffer *buf = container_of(vb, struct au0828_buffer, vb);
+ struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+ struct au0828_buffer *buf =
+ container_of(vbuf, struct au0828_buffer, vb);
struct au0828_dmaqueue *vbiq = &dev->vbiq;
unsigned long flags = 0;
struct au0828_dmaqueue *vbiq = &dev->vbiq;
unsigned long flags = 0;