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

Commit e51daefc authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Remove the unneeded vsp1_video_buffer video field 



The field is assigned but never read, remove it.

This fixes a bug caused by the struct vb2_buffer field not being be the
very first field of the vsp1_video_buffer buffer structure as required
by videobuf2.

Cc: stable@vger.kernel.org
Reported-by: default avatarTakanari Hayama <taki@igel.co.jp>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 50e59058

drivers/media/platform/vsp1/vsp1_video.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -654,8 +654,6 @@ static int vsp1_video_buffer_prepare(struct vb2_buffer *vb) 
	if (vb->num_planes < format->num_planes)

	if (vb->num_planes < format->num_planes)

		return -EINVAL;

		return -EINVAL;





	buf->video = video;



	for (i = 0; i < vb->num_planes; ++i) {

	for (i = 0; i < vb->num_planes; ++i) {

		buf->addr[i] = vb2_dma_contig_plane_dma_addr(vb, i);

		buf->addr[i] = vb2_dma_contig_plane_dma_addr(vb, i);

		buf->length[i] = vb2_plane_size(vb, i);

		buf->length[i] = vb2_plane_size(vb, i);

drivers/media/platform/vsp1/vsp1_video.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,6 @@ static inline struct vsp1_pipeline *to_vsp1_pipeline(struct media_entity *e) 
}

}





struct vsp1_video_buffer {

struct vsp1_video_buffer {

	struct vsp1_video *video;

	struct vb2_buffer buf;

	struct vb2_buffer buf;

	struct list_head queue;

	struct list_head queue;