Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 302f1abf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "[media] videobuf2-v4l2.c: send data_offset field to vb2 framework"

parents 0b564a62 d0d63841

drivers/media/v4l2-core/videobuf2-v4l2.c

+4 −0
Original line number Diff line number Diff line
@@ -330,6 +330,8 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, 
					b->m.planes[plane].m.userptr;

				planes[plane].length =

					b->m.planes[plane].length;

				planes[plane].data_offset =

					b->m.planes[plane].data_offset;

			}

		}

		if (b->memory == VB2_MEMORY_DMABUF) {
@@ -338,6 +340,8 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, 
					b->m.planes[plane].m.fd;

				planes[plane].length =

					b->m.planes[plane].length;

				planes[plane].data_offset =

					b->m.planes[plane].data_offset;

			}

		}