[PATCH 3.16 008/158] media: v4l: vsp1: Remove the unneeded vsp1_video_buffer video field
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2014-09-15 21:19:14
Also in:
lkml
3.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> commit e51daefc228aa164adcc17fe8fce0f856ad0a1cc upstream. 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. Reported-by: Takanari Hayama <redacted> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/media/platform/vsp1/vsp1_video.c | 2 -- drivers/media/platform/vsp1/vsp1_video.h | 1 - 2 files changed, 3 deletions(-)
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c@@ -654,8 +654,6 @@ static int vsp1_video_buffer_prepare(str if (vb->num_planes < format->num_planes) return -EINVAL; - buf->video = video; - for (i = 0; i < vb->num_planes; ++i) { buf->addr[i] = vb2_dma_contig_plane_dma_addr(vb, i); buf->length[i] = vb2_plane_size(vb, i); --- a/drivers/media/platform/vsp1/vsp1_video.h +++ b/drivers/media/platform/vsp1/vsp1_video.h
@@ -90,7 +90,6 @@ static inline struct vsp1_pipeline *to_v } struct vsp1_video_buffer { - struct vsp1_video *video; struct vb2_buffer buf; struct list_head queue;