[media] media: davinci: vpbe: improve vpbe_buffer_prepare() callback

this patch improve vpbe_buffer_prepare() callback, as buf_prepare()
callback is never called with invalid state and check for
vb2_plane_vaddr(vb, 0) is dropped as payload check should
be done unconditionally.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 491b8320f6a6221ced4c3a24a32686b989b2bda5..524e1fd53ada9b4c01776513d69ce06b4ec3fadf 100644 (file)
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -215,22 +215,15 @@ static int vpbe_buffer_prepare(struct vb2_buffer *vb)
        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
                                "vpbe_buffer_prepare\n");
 
-       if (vb->state != VB2_BUF_STATE_ACTIVE &&
-               vb->state != VB2_BUF_STATE_PREPARED) {
-               vb2_set_plane_payload(vb, 0, layer->pix_fmt.sizeimage);
-               if (vb2_plane_vaddr(vb, 0) &&
-               vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
-                       return -EINVAL;
+       vb2_set_plane_payload(vb, 0, layer->pix_fmt.sizeimage);
+       if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
+               return -EINVAL;
 
-               addr = vb2_dma_contig_plane_dma_addr(vb, 0);
-               if (q->streaming) {
-                       if (!IS_ALIGNED(addr, 8)) {
-                               v4l2_err(&vpbe_dev->v4l2_dev,
-                                       "buffer_prepare:offset is \
-                                       not aligned to 32 bytes\n");
-                               return -EINVAL;
-                       }
-               }
+       addr = vb2_dma_contig_plane_dma_addr(vb, 0);
+       if (!IS_ALIGNED(addr, 8)) {
+               v4l2_err(&vpbe_dev->v4l2_dev,
+                        "buffer_prepare:offset is not aligned to 32 bytes\n");
+               return -EINVAL;
        }
        return 0;
 }