Merge branch 'linus' into locking-for-linus

[deliverable/linux.git] / sound / soc / s3c24xx / s3c24xx-pcm.c

diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
index 269f5c8e7ca86097f73109a5f3773610214a356c..a9d68fa2b34a337b8d3ac853a0b2467612cb290f 100644 (file)
--- a/sound/soc/s3c24xx/s3c24xx-pcm.c
+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
@@ -161,7 +161,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
                                          prtd->params->client, NULL);
 
                if (ret < 0) {
-                       pr_debug(KERN_ERR "failed to get dma channel\n");
+                       printk(KERN_ERR "failed to get dma channel\n");
                        return ret;
                }
        }