summaryrefslogtreecommitdiffstats
path: root/sound/pci/rme9652/hdspm.c
diff options
context:
space:
mode:
authorSteven Whitehouse <steve@men-an-tol.chygwyn.com>2006-02-23 10:49:43 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2006-02-23 10:49:43 +0100
commitd35462b4bb847b68321c55e95c926aa485aecce2 (patch)
treeb08e18bf6e672633402871ee763102fdb5e63229 /sound/pci/rme9652/hdspm.c
parent[GFS2] Missed deletion of debugging code (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadlinux-d35462b4bb847b68321c55e95c926aa485aecce2.tar.xz
linux-d35462b4bb847b68321c55e95c926aa485aecce2.zip
Merge branch 'master'
Diffstat (limited to 'sound/pci/rme9652/hdspm.c')
-rw-r--r--sound/pci/rme9652/hdspm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 3dec616bad6b..103b4d715ff4 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -3324,11 +3324,11 @@ static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
snd_dma_pci_data(hdspm->pci),
wanted,
wanted)) < 0) {
- snd_printdd("Could not preallocate %d Bytes\n", wanted);
+ snd_printdd("Could not preallocate %zd Bytes\n", wanted);
return err;
} else
- snd_printdd(" Preallocated %d Bytes\n", wanted);
+ snd_printdd(" Preallocated %zd Bytes\n", wanted);
return 0;
}
@@ -3510,7 +3510,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp
hdspm->monitor_outs = enable_monitor;
- snd_printdd("kmalloc Mixer memory of %d Bytes\n",
+ snd_printdd("kmalloc Mixer memory of %zd Bytes\n",
sizeof(struct hdspm_mixer));
if ((hdspm->mixer = kmalloc(sizeof(struct hdspm_mixer), GFP_KERNEL))
== NULL) {