diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2014-02-21 09:16:32 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-11 12:22:22 (GMT) |
| commit | c817d927b0f7c3b3c8defa7c6ce77f934ec31eb7 (patch) | |
| tree | 6a1506f13bb21482178a68b43802f4273d20310c /drivers/media/v4l2-core/v4l2-ctrls.c | |
| parent | 9b05837352e7c90b5af81fb7a5e499e91d376ee0 (diff) | |
| download | linux-c817d927b0f7c3b3c8defa7c6ce77f934ec31eb7.tar.xz | |
[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>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ctrls.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ctrls.c | 3 |
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 1168f68..5c3e8ca 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]) { |