mem2mem: replace BUG_ON with WARN_ON

PATCH New Nicolas THERY 1 participant 1 message Oct 23, 2012 Media (V4L/DVB)

lore

Share & tools

lore

Nicolas THERY

author

2012-10-23 08:47 UTC #0 lore raw

PATCH 1/1 mem2mem: replace BUG_ON with WARN_ON

See following thread for rationale:

	http://www.spinics.net/lists/linux-media/msg52462.html

Tested by compilation only.

Signed-off-by Nicolas Thery <[email protected]>

---
 drivers/media/v4l2-core/v4l2-mem2mem.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

drivers/media/v4l2-core/v4l2-mem2mem.c +2 -4

index 3ac8358..017fed8 100644
@@ -510,12 +510,10 @@ struct v4l2_m2m_dev *v4l2_m2m_init(struct v4l2_m2m_ops *m2m_ops)
 {
 	struct v4l2_m2m_dev *m2m_dev;
 
-	if (!m2m_ops)
+	if (!m2m_ops || WARN_ON(!m2m_ops->device_run) ||
+			WARN_ON(!m2m_ops->job_abort))
 		return ERR_PTR(-EINVAL);
 
-	BUG_ON(!m2m_ops->device_run);
-	BUG_ON(!m2m_ops->job_abort);
-
 	m2m_dev = kzalloc(sizeof *m2m_dev, GFP_KERNEL);
 	if (!m2m_dev)
 		return ERR_PTR(-ENOMEM);

--
1.7.11.3