upstream: [media] v4l2-ctrls: replace BUG_ON by WARN_ON
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 21 Feb 2014 09:16:32 +0000 (06:16 -0300)
committerChanho Park <chanho61.park@samsung.com>
Tue, 18 Nov 2014 02:54:55 +0000 (11:54 +0900)
BUG_ON is unnecessarily strict.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/v4l2-core/v4l2-ctrls.c

index e4bfdbb..c1e10c4 100644 (file)
@@ -1937,7 +1937,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]) {