diff options
author | David Bauer <mail@david-bauer.net> | 2021-08-19 20:40:29 +0200 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2021-08-24 19:41:47 +0200 |
commit | 378769b5551714ccaa821b481bfeecbf362f351e (patch) | |
tree | 68fdc61b2ff165132b30bf325ab1ba13a8e6a5c1 /target/linux/bcm27xx/patches-5.4/950-0174-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch | |
parent | 662401d903ae542e9868e572e318d5411ec756a7 (diff) | |
download | upstream-378769b5551714ccaa821b481bfeecbf362f351e.tar.gz upstream-378769b5551714ccaa821b481bfeecbf362f351e.tar.bz2 upstream-378769b5551714ccaa821b481bfeecbf362f351e.zip |
kernel: bump 5.4 to 5.4.142
Compile-tested: ath79-generic ipq40xx-generic
Run-tested: ipq40xx-generic
Signed-off-by: David Bauer <mail@david-bauer.net>
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.patch | 4 |
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; } |