From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 21 Feb 2014 09:16:32 +0000 (-0300)
Subject: upstream: [media] v4l2-ctrls: replace BUG_ON by WARN_ON
X-Git-Tag: submit/tizen/20141121.110247~1375
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e191fc87c7f4ec83e70b100211d3182fc3a3ec29;p=platform%2Fkernel%2Flinux-3.10.git

upstream: [media] v4l2-ctrls: replace BUG_ON by WARN_ON

BUG_ON is unnecessarily strict.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index e4bfdbb..c1e10c4 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -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]) {