diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-05-21 17:39:16 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-17 09:19:06 -0700 |
| commit | 8bf210770c74c17464b3399d0c5d892d27cea516 (patch) | |
| tree | 7f3cb8f717fee993225524651e24c500ed748bbe /drivers | |
| parent | 2d826fecb15e82fb0af51435458435cc8088c790 (diff) | |
| download | kernel-common-8bf210770c74c17464b3399d0c5d892d27cea516.tar.gz kernel-common-8bf210770c74c17464b3399d0c5d892d27cea516.tar.bz2 kernel-common-8bf210770c74c17464b3399d0c5d892d27cea516.zip | |
media: v4l: vsp1: Remove the unneeded vsp1_video_buffer video field
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 <taki@igel.co.jp>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_video.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_video.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index b4687a834f85..7245cca89257 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -635,8 +635,6 @@ static int vsp1_video_buffer_prepare(struct vb2_buffer *vb) 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); diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platform/vsp1/vsp1_video.h index d8612a378345..47b7a8ab5e2f 100644 --- a/drivers/media/platform/vsp1/vsp1_video.h +++ b/drivers/media/platform/vsp1/vsp1_video.h @@ -89,7 +89,6 @@ static inline struct vsp1_pipeline *to_vsp1_pipeline(struct media_entity *e) } struct vsp1_video_buffer { - struct vsp1_video *video; struct vb2_buffer buf; struct list_head queue; |