diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-05 19:57:23 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-05 19:57:23 +0100 |
| commit | 3e0b33f786e7f950f2430a305169f3db4a1a5521 (patch) | |
| tree | 7b07ae1233bb0ea11ec3b8923e866a25c3e19187 /sound/pci/ctxfi/ctatc.c | |
| parent | a26a408888b2968d5de5af233655f6497ac5623f (diff) | |
| parent | 9d4c7464458770d309169f7a7ce1ea6f8a4a7de5 (diff) | |
| download | linux-3e0b33f786e7f950f2430a305169f3db4a1a5521.tar.bz2 | |
Merge remote branch 'alsa/fixes' into for-linus
Diffstat (limited to 'sound/pci/ctxfi/ctatc.c')
| -rw-r--r-- | sound/pci/ctxfi/ctatc.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index cb65bd0dd35b..459c1f62783b 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -166,18 +166,7 @@ static void ct_unmap_audio_buffer(struct ct_atc *atc, struct ct_atc_pcm *apcm) static unsigned long atc_get_ptp_phys(struct ct_atc *atc, int index) { - struct ct_vm *vm; - void *kvirt_addr; - unsigned long phys_addr; - - vm = atc->vm; - kvirt_addr = vm->get_ptp_virt(vm, index); - if (kvirt_addr == NULL) - phys_addr = (~0UL); - else - phys_addr = virt_to_phys(kvirt_addr); - - return phys_addr; + return atc->vm->get_ptp_phys(atc->vm, index); } static unsigned int convert_format(snd_pcm_format_t snd_format) @@ -1669,7 +1658,7 @@ int __devinit ct_atc_create(struct snd_card *card, struct pci_dev *pci, } /* Set up device virtual memory management object */ - err = ct_vm_create(&atc->vm); + err = ct_vm_create(&atc->vm, pci); if (err < 0) goto error1; |