diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:07 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:07 -0700 |
| commit | 72df321f602520b6ea09f47a71b6795efc0a83c8 (patch) | |
| tree | e32e2d9dff3d90f49e95f0bfa61860eac0dc3ed3 /drivers/media/platform/vsp1 | |
| parent | 1414ffefd32b80f827a697505a9eede86978ebbb (diff) | |
| parent | 0111d0f13469831266d716e3b50d580a3e25cff9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.09
Diffstat (limited to 'drivers/media/platform/vsp1')
| -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; |