Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	.qmake.conf
	tests/auto/integration/qsoundeffect/BLACKLIST

Change-Id: Icd2edd4410a4ee914d489634d26b262c0c146bf4

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
index d2be15e71..6ca1dbe94 100644
--- a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp
@@ -200,8 +200,10 @@ void CameraBinV4LImageProcessing::setParameter(
         const QCameraImageProcessing::WhiteBalanceMode m =
                 value.value<QCameraImageProcessing::WhiteBalanceMode>();
         if (m != QCameraImageProcessing::WhiteBalanceAuto
-                && m != QCameraImageProcessing::WhiteBalanceManual)
+                && m != QCameraImageProcessing::WhiteBalanceManual) {
+            qt_safe_close(fd);
             return;
+        }
 
         control.value = (m == QCameraImageProcessing::WhiteBalanceAuto) ? true : false;
     }
@@ -220,6 +222,7 @@ void CameraBinV4LImageProcessing::setParameter(
         break;
 
     default:
+        qt_safe_close(fd);
         return;
     }