From: Takashi Iwai <ti...@suse.de>

commit befff4fbc27e19b14b343eb4a65d8f75d38b6230 upstream

Don't use BUG_ON() for a non-critical sanity check on production
systems.  This patch replaces with a softer WARN_ON() and an error
path.

Signed-off-by: Takashi Iwai <ti...@suse.de>
Signed-off-by: Mark Brown <broo...@kernel.org>
Signed-off-by: Mathieu Poirier <mathieu.poir...@linaro.org>
---
 sound/soc/davinci/davinci-mcasp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/davinci/davinci-mcasp.c 
b/sound/soc/davinci/davinci-mcasp.c
index af6cd8b874f5..b4e6f4a04cb6 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1748,7 +1748,8 @@ static int davinci_mcasp_get_dma_type(struct 
davinci_mcasp *mcasp)
                                PTR_ERR(chan));
                return PTR_ERR(chan);
        }
-       BUG_ON(!chan->device || !chan->device->dev);
+       if (WARN_ON(!chan->device || !chan->device->dev))
+               return -EINVAL;
 
        if (chan->device->dev->of_node)
                ret = of_property_read_string(chan->device->dev->of_node,
-- 
2.17.1

Reply via email to