diff options
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) | |||
| 166 | 166 | ||
| 167 | static unsigned long atc_get_ptp_phys(struct ct_atc *atc, int index) | 167 | static unsigned long atc_get_ptp_phys(struct ct_atc *atc, int index) |
| 168 | { | 168 | { |
| 169 | struct ct_vm *vm; | 169 | return atc->vm->get_ptp_phys(atc->vm, index); |
| 170 | void *kvirt_addr; | ||
| 171 | unsigned long phys_addr; | ||
| 172 | |||
| 173 | vm = atc->vm; | ||
| 174 | kvirt_addr = vm->get_ptp_virt(vm, index); | ||
| 175 | if (kvirt_addr == NULL) | ||
| 176 | phys_addr = (~0UL); | ||
| 177 | else | ||
| 178 | phys_addr = virt_to_phys(kvirt_addr); | ||
| 179 | |||
| 180 | return phys_addr; | ||
| 181 | } | 170 | } |
| 182 | 171 | ||
| 183 | static unsigned int convert_format(snd_pcm_format_t snd_format) | 172 | 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, | |||
| 1669 | } | 1658 | } |
| 1670 | 1659 | ||
| 1671 | /* Set up device virtual memory management object */ | 1660 | /* Set up device virtual memory management object */ |
| 1672 | err = ct_vm_create(&atc->vm); | 1661 | err = ct_vm_create(&atc->vm, pci); |
| 1673 | if (err < 0) | 1662 | if (err < 0) |
| 1674 | goto error1; | 1663 | goto error1; |
| 1675 | 1664 | ||
