Merge tag 'staging-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / drivers / staging / vc04_services / bcm2835-camera / bcm2835-camera.c

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 6dd0c838db05fe24207b2c4ecd944b888cdddfc1..c04bdf070c87610c93ff8ab89962bd6908a64300 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -580,6 +580,7 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
 static void stop_streaming(struct vb2_queue *vq)
 {
        int ret;
+       unsigned long timeout;
        struct bm2835_mmal_dev *dev = vb2_get_drv_priv(vq);
 
        v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "%s: dev:%p\n",
@@ -605,10 +606,10 @@ static void stop_streaming(struct vb2_queue *vq)
                                      sizeof(dev->capture.frame_count));
 
        /* wait for last frame to complete */
-       ret = wait_for_completion_timeout(&dev->capture.frame_cmplt, HZ);
-       if (ret <= 0)
+       timeout = wait_for_completion_timeout(&dev->capture.frame_cmplt, HZ);
+       if (timeout == 0)
                v4l2_err(&dev->v4l2_dev,
-                        "error %d waiting for frame completion\n", ret);
+                        "timed out waiting for frame completion\n");
 
        v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
                 "disabling connection\n");