summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/media
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-09-21 00:07:02 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2015-09-22 23:15:55 +0200
commit7b34ea21fb51a3d1dcb6c42264b96bd120ad1c28 (patch)
tree94150353cdba1975a035a9ed4c47230d826300a4 /patches/collateral-evolutions/media
parentb12be779f99f1d9b068e3c2014d306f9d43febe5 (diff)
patches: refresh patches on next-20150903backports-20150903
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.71 [ OK ] 4 3.3.8 [ OK ] 5 3.4.108 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.88 [ OK ] 12 3.11.10 [ OK ] 13 3.12.47 [ OK ] 14 3.13.11 [ OK ] 15 3.14.52 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.21 [ OK ] 20 3.19.8 [ OK ] 21 4.0.9 [ OK ] 22 4.1.7 [ OK ] 23 4.2.0 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/media')
-rw-r--r--patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch
index 89eb464f..8a90f65b 100644
--- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch
+++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch
@@ -247,7 +247,7 @@
static void vb2_vmalloc_put(void *buf_priv);
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
-@@ -121,8 +121,10 @@ int v4l2_m2m_prepare_buf(struct file *fi
+@@ -125,8 +125,10 @@ int v4l2_m2m_prepare_buf(struct file *fi
int v4l2_m2m_create_bufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
struct v4l2_create_buffers *create);
@@ -258,7 +258,7 @@
int v4l2_m2m_streamon(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
enum v4l2_buf_type type);
-@@ -244,8 +246,10 @@ int v4l2_m2m_ioctl_create_bufs(struct fi
+@@ -264,8 +266,10 @@ int v4l2_m2m_ioctl_create_bufs(struct fi
struct v4l2_create_buffers *create);
int v4l2_m2m_ioctl_querybuf(struct file *file, void *fh,
struct v4l2_buffer *buf);
@@ -296,7 +296,7 @@
void *(*vaddr)(void *buf_priv);
void *(*cookie)(void *buf_priv);
-@@ -465,7 +469,9 @@ void vb2_queue_release(struct vb2_queue
+@@ -467,7 +471,9 @@ void vb2_queue_release(struct vb2_queue
void vb2_queue_error(struct vb2_queue *q);
int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b);
@@ -306,7 +306,7 @@
int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking);
int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
-@@ -639,8 +645,10 @@ int vb2_ioctl_qbuf(struct file *file, vo
+@@ -641,8 +647,10 @@ int vb2_ioctl_qbuf(struct file *file, vo
int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p);
int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i);
int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i);