diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
commit | 33052057e3e2db7f37fc78aa3f25c98f7e989fae (patch) | |
tree | e80a3aa1371f513c833dc94a16674f78faeeeb1d /sound/pci/rme9652/hdspm.c | |
parent | 00b464debf0038b1628996065f0be564ccfbfd86 (diff) | |
parent | 1113a7e92e483074c6235da59460759e33b9b144 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/pci/rme9652/hdspm.c')
-rw-r--r-- | sound/pci/rme9652/hdspm.c | 6 |
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) | |||
3324 | snd_dma_pci_data(hdspm->pci), | 3324 | snd_dma_pci_data(hdspm->pci), |
3325 | wanted, | 3325 | wanted, |
3326 | wanted)) < 0) { | 3326 | wanted)) < 0) { |
3327 | snd_printdd("Could not preallocate %d Bytes\n", wanted); | 3327 | snd_printdd("Could not preallocate %zd Bytes\n", wanted); |
3328 | 3328 | ||
3329 | return err; | 3329 | return err; |
3330 | } else | 3330 | } else |
3331 | snd_printdd(" Preallocated %d Bytes\n", wanted); | 3331 | snd_printdd(" Preallocated %zd Bytes\n", wanted); |
3332 | 3332 | ||
3333 | return 0; | 3333 | return 0; |
3334 | } | 3334 | } |
@@ -3510,7 +3510,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp | |||
3510 | 3510 | ||
3511 | hdspm->monitor_outs = enable_monitor; | 3511 | hdspm->monitor_outs = enable_monitor; |
3512 | 3512 | ||
3513 | snd_printdd("kmalloc Mixer memory of %d Bytes\n", | 3513 | snd_printdd("kmalloc Mixer memory of %zd Bytes\n", |
3514 | sizeof(struct hdspm_mixer)); | 3514 | sizeof(struct hdspm_mixer)); |
3515 | if ((hdspm->mixer = kmalloc(sizeof(struct hdspm_mixer), GFP_KERNEL)) | 3515 | if ((hdspm->mixer = kmalloc(sizeof(struct hdspm_mixer), GFP_KERNEL)) |
3516 | == NULL) { | 3516 | == NULL) { |