summaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gus_dma.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-11-09 23:33:22 +0100
committerSteve French <sfrench@us.ibm.com>2005-11-09 23:33:22 +0100
commite82b3aec8d508d2a925a4c766e97f16b7c4dfb1b (patch)
tree69d5685ef0c194f651a03e30bff14628b4d45400 /sound/isa/gus/gus_dma.c
parent[CIFS] Update kconfig for cifs (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff)
downloadlinux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.tar.xz
linux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/isa/gus/gus_dma.c')
-rw-r--r--sound/isa/gus/gus_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c
index de4b56d80b35..ef1b2e9832e4 100644
--- a/sound/isa/gus/gus_dma.c
+++ b/sound/isa/gus/gus_dma.c
@@ -199,7 +199,7 @@ int snd_gf1_dma_transfer_block(snd_gus_card_t * gus,
block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
if (block == NULL) {
- snd_printk("gf1: DMA transfer failure; not enough memory\n");
+ snd_printk(KERN_ERR "gf1: DMA transfer failure; not enough memory\n");
return -ENOMEM;
}
*block = *__block;