[media] soc_camera: always release queue for queue owner

Always release the queue if the owner closes its filehandle and not when
it is the last open filehandle.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 0b09281bdd7f209c3d368758c17dff7cc76f6ab7..9087fed586fba29281d2a24c7500096a77339bf9 100644 (file)
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -788,20 +788,21 @@ static int soc_camera_close(struct file *file)
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
 
        mutex_lock(&ici->host_lock);
+       if (icd->streamer == file) {
+               if (ici->ops->init_videobuf2)
+                       vb2_queue_release(&icd->vb2_vidq);
+               icd->streamer = NULL;
+       }
        icd->use_count--;
        if (!icd->use_count) {
                pm_runtime_suspend(&icd->vdev->dev);
                pm_runtime_disable(&icd->vdev->dev);
 
-               if (ici->ops->init_videobuf2)
-                       vb2_queue_release(&icd->vb2_vidq);
                __soc_camera_power_off(icd);
 
                soc_camera_remove_device(icd);
        }
 
-       if (icd->streamer == file)
-               icd->streamer = NULL;
        mutex_unlock(&ici->host_lock);
 
        module_put(ici->ops->owner);