aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-08-12 09:28:18 -0400
committerDavid Bauer <mail@david-bauer.net>2021-08-14 20:25:25 +0200
commited9341dd78dcf86828769a7244a989d2c6ac2dbc (patch)
tree370efc0c78c6552227e10e3ca599eb2b4cd48fe0 /target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
parent02e2723ef317c65b6ddfc70144b10f9936cfc2af (diff)
downloadupstream-ed9341dd78dcf86828769a7244a989d2c6ac2dbc.tar.gz
upstream-ed9341dd78dcf86828769a7244a989d2c6ac2dbc.tar.bz2
upstream-ed9341dd78dcf86828769a7244a989d2c6ac2dbc.zip
kernel: bump 5.4 to 5.4.140
Removed upstreamed bcm27xx/patches-5.4: 950-0977-USB-gadget-f_hid-avoid-crashes-and-log-spam.patch 950-0980-SQUASH-USB-gadget-f_hid-remove-more-spam.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
index 74d03540ad..24ea0a9717 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
@@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
-@@ -2073,12 +2073,12 @@ static int __find_plane_by_offset(struct
+@@ -2084,12 +2084,12 @@ static int __find_plane_by_offset(struct
return -EINVAL;
}
@@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
struct dma_buf *dbuf;
if (q->memory != VB2_MEMORY_MMAP) {
-@@ -2128,6 +2128,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
+@@ -2139,6 +2139,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
return -EINVAL;
}