Commit 67f85135 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Mauro Carvalho Chehab
Browse files

media: videobuf2: always set buffer vb2 pointer 



We need to always link allocated vb2_dc_buf back to vb2_buffer because
we dereference vb2 in prepare() and finish() callbacks.

Signed-off-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Tested-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Acked-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent cd0e5e8c

drivers/media/common/videobuf2/videobuf2-dma-contig.c

+3 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ static void *vb2_dc_get_userptr(struct vb2_buffer *vb, struct device *dev, 


	buf->dev = dev;

	buf->dma_dir = vb->vb2_queue->dma_dir;

	buf->vb = vb;



	offset = lower_32_bits(offset_in_page(vaddr));

	vec = vb2_create_framevec(vaddr, size);
@@ -788,6 +789,8 @@ static void *vb2_dc_attach_dmabuf(struct vb2_buffer *vb, struct device *dev, 
		return ERR_PTR(-ENOMEM);



	buf->dev = dev;

	buf->vb = vb;



	/* create attachment for the dmabuf with the user device */

	dba = dma_buf_attach(dbuf, buf->dev);

	if (IS_ERR(dba)) {