1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 1168f683fd48..5c3e8ca9b1d1 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -1942,7 +1942,8 @@ void v4l2_ctrl_cluster(unsigned ncontrols, struct v4l2_ctrl **controls)
         int i;
 
         /* The first control is the master control and it must not be NULL */
-        BUG_ON(ncontrols == 0 || controls[0] == NULL);
+        if (WARN_ON(ncontrols == 0 || controls[0] == NULL))
+                return;
 
         for (i = 0; i < ncontrols; i++) {
                 if (controls[i]) {