summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorHans Verkuil2014-03-04 11:27:13 +0100
committerMauro Carvalho Chehab2014-03-11 10:56:38 +0100
commit0647064293d745720fc62e2edc7734fa8af06adf (patch)
treeb8e1092039c7a3a10ef3102b8bf1ee4fc028f75e /drivers/media/pci
parent[media] vb2: add debugging code to check for unbalanced ops (diff)
downloadkernel-qcow2-linux-0647064293d745720fc62e2edc7734fa8af06adf.tar.gz
kernel-qcow2-linux-0647064293d745720fc62e2edc7734fa8af06adf.tar.xz
kernel-qcow2-linux-0647064293d745720fc62e2edc7734fa8af06adf.zip
[media] vb2: change result code of buf_finish to void
The buf_finish op should always work, so change the return type to void. Update the few drivers that use it. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Pawel Osciak <pawel@osciak.com> Reviewed-by: Pawel Osciak <pawel@osciak.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/sta2x11/sta2x11_vip.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
index e5cfb6cfa18d..e66556cae7ea 100644
--- a/drivers/media/pci/sta2x11/sta2x11_vip.c
+++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
@@ -327,7 +327,7 @@ static void buffer_queue(struct vb2_buffer *vb)
}
spin_unlock(&vip->lock);
}
-static int buffer_finish(struct vb2_buffer *vb)
+static void buffer_finish(struct vb2_buffer *vb)
{
struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
struct vip_buffer *vip_buf = to_vip_buffer(vb);
@@ -338,8 +338,6 @@ static int buffer_finish(struct vb2_buffer *vb)
spin_unlock(&vip->lock);
vip_active_buf_next(vip);
-
- return 0;
}
static int start_streaming(struct vb2_queue *vq, unsigned int count)