Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / sound / core / isadma.c

diff --git a/sound/core/isadma.c b/sound/core/isadma.c
index e2b386156a4c300ed0f78b50fa1bebc71d54689a..31e8544d7f2d760320d9db504cafa398d70bda49 100644 (file)
--- a/sound/core/isadma.c
+++ b/sound/core/isadma.c
@@ -106,7 +106,7 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
                result = result1;
 #ifdef CONFIG_SND_DEBUG
        if (result > size)
-               snd_printk(KERN_ERR "pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n", result, dma, size);
+               pr_err("ALSA: pointer (0x%x) for DMA #%ld is greater than transfer size (0x%x)\n", result, dma, size);
 #endif
        if (result >= size || result == 0)
                return 0;