]>
Commit | Line | Data |
---|---|---|
fc58cd71 GKH |
1 | From e51daefc228aa164adcc17fe8fce0f856ad0a1cc Mon Sep 17 00:00:00 2001 |
2 | From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
3 | Date: Wed, 21 May 2014 17:39:16 -0300 | |
4 | Subject: media: v4l: vsp1: Remove the unneeded vsp1_video_buffer video field | |
5 | ||
6 | From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
7 | ||
8 | commit e51daefc228aa164adcc17fe8fce0f856ad0a1cc upstream. | |
9 | ||
10 | The field is assigned but never read, remove it. | |
11 | ||
12 | This fixes a bug caused by the struct vb2_buffer field not being be the | |
13 | very first field of the vsp1_video_buffer buffer structure as required | |
14 | by videobuf2. | |
15 | ||
16 | Reported-by: Takanari Hayama <taki@igel.co.jp> | |
17 | Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
18 | Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> | |
19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
20 | ||
21 | --- | |
22 | drivers/media/platform/vsp1/vsp1_video.c | 2 -- | |
23 | drivers/media/platform/vsp1/vsp1_video.h | 1 - | |
24 | 2 files changed, 3 deletions(-) | |
25 | ||
26 | --- a/drivers/media/platform/vsp1/vsp1_video.c | |
27 | +++ b/drivers/media/platform/vsp1/vsp1_video.c | |
28 | @@ -654,8 +654,6 @@ static int vsp1_video_buffer_prepare(str | |
29 | if (vb->num_planes < format->num_planes) | |
30 | return -EINVAL; | |
31 | ||
32 | - buf->video = video; | |
33 | - | |
34 | for (i = 0; i < vb->num_planes; ++i) { | |
35 | buf->addr[i] = vb2_dma_contig_plane_dma_addr(vb, i); | |
36 | buf->length[i] = vb2_plane_size(vb, i); | |
37 | --- a/drivers/media/platform/vsp1/vsp1_video.h | |
38 | +++ b/drivers/media/platform/vsp1/vsp1_video.h | |
39 | @@ -90,7 +90,6 @@ static inline struct vsp1_pipeline *to_v | |
40 | } | |
41 | ||
42 | struct vsp1_video_buffer { | |
43 | - struct vsp1_video *video; | |
44 | struct vb2_buffer buf; | |
45 | struct list_head queue; | |
46 |