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:21:49 -0700 |
| commit | f9cf6fb924215602c913dfbce30f971c284f5e8b (patch) | |
| tree | 4572ac00b372ab9b9341b7042b701cff0d622ee4 /drivers/media/platform | |
| parent | 85c9db42b859ec8abe846fa1d9b82e25c102c107 (diff) | |
| download | linux-stable-f9cf6fb924215602c913dfbce30f971c284f5e8b.tar.gz linux-stable-f9cf6fb924215602c913dfbce30f971c284f5e8b.tar.bz2 linux-stable-f9cf6fb924215602c913dfbce30f971c284f5e8b.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/media/platform')
| -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 8a1253e51f04..677e3aa04eee 100644 --- 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(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 c04d48fa2999..7284320d5433 100644 --- 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_vsp1_pipeline(struct media_entity *e) } struct vsp1_video_buffer { - struct vsp1_video *video; struct vb2_buffer buf; struct list_head queue; |