diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2014-02-21 06:16:32 -0300 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:54:55 +0900 |
| commit | e191fc87c7f4ec83e70b100211d3182fc3a3ec29 (patch) | |
| tree | d1e0279138210045a3e2afe2b010c7a69189ae3f /drivers/media/v4l2-core | |
| parent | 81f76c87d4893b7d15f8c96d94b42daf0ab5a281 (diff) | |
| download | linux-3.10-e191fc87c7f4ec83e70b100211d3182fc3a3ec29.tar.gz linux-3.10-e191fc87c7f4ec83e70b100211d3182fc3a3ec29.tar.bz2 linux-3.10-e191fc87c7f4ec83e70b100211d3182fc3a3ec29.zip | |
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>
Diffstat (limited to 'drivers/media/v4l2-core')
| -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 e4bfdbb74bd..c1e10c4286a 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]) { |