Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / sound / soc / pxa / pxa2xx-i2s.c

diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index d5340a088858eff3f8a8b578a38a2ea3e7476bf1..e68290c15328abe7f2c48c8f7187a65fd8b3bcc4 100644 (file)
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -165,7 +165,8 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_dmaengine_dai_dma_data *dma_data;
 
-       BUG_ON(IS_ERR(clk_i2s));
+       if (WARN_ON(IS_ERR(clk_i2s)))
+               return -EINVAL;
        clk_prepare_enable(clk_i2s);
        clk_ena = 1;
        pxa_i2s_wait();
@@ -382,7 +383,6 @@ static struct platform_driver pxa2xx_i2s_driver = {
 
        .driver = {
                .name = "pxa2xx-i2s",
-               .owner = THIS_MODULE,
        },
 };