diff --git a/device/camera/camera_decoder.c b/device/camera/camera_decoder.c
index d1d4e73..56cde49 100644
--- a/device/camera/camera_decoder.c
+++ b/device/camera/camera_decoder.c
@@ -20,7 +20,7 @@ int camera_configure_decoder(camera_t *camera, buffer_list_t *camera_src)
     return -1;
   }
 
-  if (device_open_buffer_list_capture(camera->decoder, NULL, 1.0, 0, true) < 0) {
+  if (!device_open_buffer_list_capture(camera->decoder, NULL, 1.0, 0, true)) {
     return -1;
   }
 
@@ -34,7 +34,7 @@ int camera_configure_decoder(camera_t *camera, buffer_list_t *camera_src)
     camera->codec_jpeg = device_v4l2_open("JPEG", "/dev/video31");
 
     if (!device_open_buffer_list_output(camera->codec_jpeg, src) ||
-      device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
+      !device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true)) {
       return -1;
     }
   }
@@ -43,7 +43,7 @@ int camera_configure_decoder(camera_t *camera, buffer_list_t *camera_src)
     camera->codec_h264 = device_v4l2_open("H264", "/dev/video11");
 
     if (!device_open_buffer_list_output(camera->codec_h264, src) ||
-      device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) {
+      !device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true)) {
       return -1;
     }
   }
diff --git a/device/camera/camera_direct.c b/device/camera/camera_direct.c
index fdcabfd..62be026 100644
--- a/device/camera/camera_direct.c
+++ b/device/camera/camera_direct.c
@@ -20,11 +20,11 @@ int camera_configure_direct(camera_t *camera, buffer_list_t *src)
     return -1;
   }
 
-  if (device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
+  if (!device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true)) {
     return -1;
   }
 
-  if (device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) {
+  if (!device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true)) {
     return -1;
   }
 
diff --git a/device/camera/camera_isp.c b/device/camera/camera_isp.c
index 85c27b2..49de880 100644
--- a/device/camera/camera_isp.c
+++ b/device/camera/camera_isp.c
@@ -19,7 +19,7 @@ int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, f
   camera->codec_h264 = device_v4l2_open("H264", "/dev/video11");
 
   if (!device_open_buffer_list_output(camera->isp_srgb, src) ||
-    device_open_buffer_list_capture(camera->isp_yuuv, camera->isp_srgb->output_list, high_div, V4L2_PIX_FMT_YUYV, true) < 0) {
+    !device_open_buffer_list_capture(camera->isp_yuuv, camera->isp_srgb->output_list, high_div, V4L2_PIX_FMT_YUYV, true)) {
     return -1;
   }
 
@@ -31,12 +31,12 @@ int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, f
   src = camera->isp_yuuv->capture_list;
 
   if (!device_open_buffer_list_output(camera->codec_jpeg, src) ||
-    device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
+    !device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
     return -1;
   }
 
   if (!device_open_buffer_list_output(camera->codec_h264, src) ||
-    device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) {
+    !device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true)) {
     return -1;
   }
 
@@ -53,7 +53,7 @@ int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, f
   camera->codec_jpeg_lowres = device_v4l2_open("JPEG-LOW", "/dev/video31");
   camera->codec_h264_lowres = device_v4l2_open("H264-LOW", "/dev/video11");
 
-  if (device_open_buffer_list_capture(camera->isp_yuuv_lowres, camera->camera->capture_list, low_div, V4L2_PIX_FMT_YUYV, true) < 0) {
+  if (!device_open_buffer_list_capture(camera->isp_yuuv_lowres, camera->camera->capture_list, low_div, V4L2_PIX_FMT_YUYV, true)) {
     return -1;
   }
 
@@ -61,12 +61,12 @@ int camera_configure_isp(camera_t *camera, buffer_list_t *src, float high_div, f
   src = camera->isp_yuuv_lowres->capture_list;
 
   if (!device_open_buffer_list_output(camera->codec_jpeg_lowres, src) ||
-    device_open_buffer_list_capture(camera->codec_jpeg_lowres, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
+    !device_open_buffer_list_capture(camera->codec_jpeg_lowres, src, 1.0, V4L2_PIX_FMT_JPEG, true)) {
     return -1;
   }
 
   if (!device_open_buffer_list_output(camera->codec_h264_lowres, src) ||
-    device_open_buffer_list_capture(camera->codec_h264_lowres, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) {
+    !device_open_buffer_list_capture(camera->codec_h264_lowres, src, 1.0, V4L2_PIX_FMT_H264, true)) {
     return -1;
   }
 
diff --git a/device/camera/camera_legacy_isp.c b/device/camera/camera_legacy_isp.c
index f4f9142..38a43da 100644
--- a/device/camera/camera_legacy_isp.c
+++ b/device/camera/camera_legacy_isp.c
@@ -28,19 +28,19 @@ int camera_configure_legacy_isp(camera_t *camera, buffer_list_t *src, float div)
   camera->codec_h264 = device_v4l2_open("H264", "/dev/video11");
 
   if (!device_open_buffer_list_output(camera->legacy_isp, src) ||
-    device_open_buffer_list_capture(camera->legacy_isp, src, div, V4L2_PIX_FMT_YUYV, true) < 0) {
+    !device_open_buffer_list_capture(camera->legacy_isp, src, div, V4L2_PIX_FMT_YUYV, true)) {
     return -1;
   }
 
   src = camera->legacy_isp->capture_list;
 
   if (!device_open_buffer_list_output(camera->codec_jpeg, src) ||
-    device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true) < 0) {
+    !device_open_buffer_list_capture(camera->codec_jpeg, src, 1.0, V4L2_PIX_FMT_JPEG, true)) {
     return -1;
   }
 
   if (!device_open_buffer_list_output(camera->codec_h264, src) ||
-    device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true) < 0) {
+    !device_open_buffer_list_capture(camera->codec_h264, src, 1.0, V4L2_PIX_FMT_H264, true)) {
     return -1;
   }
 
diff --git a/device/device.c b/device/device.c
index 8dffc77..7016a12 100644
--- a/device/device.c
+++ b/device/device.c
@@ -105,22 +105,18 @@ buffer_list_t *device_open_buffer_list_output(device_t *dev, buffer_list_t *capt
     capture_list->dev->opts.allow_dma ? !capture_list->do_mmap : true);
 }
 
-int device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, float div, unsigned format, bool do_mmap)
+buffer_list_t *device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, float div, unsigned format, bool do_mmap)
 {
   if (!output_list) {
     output_list = dev->output_list;
   }
   if (!output_list) {
-    return -1;
+    return NULL;
   }
 
-  if (device_open_buffer_list(dev, true,
+  return device_open_buffer_list(dev, true,
     output_list->fmt.width / div, output_list->fmt.height / div,
-    format, 0, output_list->nbufs, do_mmap)) {
-      return 0;
-    }
-
-  return -1;
+    format, 0, output_list->nbufs, do_mmap);
 }
 
 int device_set_stream(device_t *dev, bool do_on)
diff --git a/device/device.h b/device/device.h
index b8379d3..c4017c6 100644
--- a/device/device.h
+++ b/device/device.h
@@ -56,7 +56,7 @@ void device_close(device_t *dev);
 
 buffer_list_t *device_open_buffer_list(device_t *dev, bool do_capture, unsigned width, unsigned height, unsigned format, unsigned bytesperline, int nbufs, bool do_mmap);
 buffer_list_t *device_open_buffer_list_output(device_t *dev, buffer_list_t *capture_list);
-int device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, float div, unsigned format, bool do_mmap);
+buffer_list_t *device_open_buffer_list_capture(device_t *dev, buffer_list_t *output_list, float div, unsigned format, bool do_mmap);
 int device_consume_event(device_t *dev);
 
 int device_set_stream(device_t *dev, bool do_on);