]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] mem2mem: replace BUG_ON with WARN_ON
authorNicolas THERY <nicolas.thery@st.com>
Tue, 23 Oct 2012 07:47:19 +0000 (04:47 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 28 Oct 2012 20:45:03 +0000 (18:45 -0200)
See following thread for rationale:
http://www.spinics.net/lists/linux-media/msg52462.html
Tested by compilation only.

Signed-off-by: Nicolas Thery <nicolas.thery@st.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/v4l2-core/v4l2-mem2mem.c

index 3ac83583ad7ae5695e3087d2960bc88647c4e501..017fed8ad2abef60562d1564a4d1071139bbff4c 100644 (file)
@@ -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);