diff options
Diffstat (limited to 'sound/pci/rme9652/hdsp.c')
| -rw-r--r-- | sound/pci/rme9652/hdsp.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index 12efbf0fab54..a673cc438b91 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
| @@ -559,18 +559,22 @@ static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer | |||
| 559 | { | 559 | { |
| 560 | dmab->dev.type = SNDRV_DMA_TYPE_DEV; | 560 | dmab->dev.type = SNDRV_DMA_TYPE_DEV; |
| 561 | dmab->dev.dev = snd_dma_pci_data(pci); | 561 | dmab->dev.dev = snd_dma_pci_data(pci); |
| 562 | if (! snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) { | 562 | if (snd_dma_get_reserved_buf(dmab, snd_dma_pci_buf_id(pci))) { |
| 563 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), | 563 | if (dmab->bytes >= size) |
| 564 | size, dmab) < 0) | 564 | return 0; |
| 565 | return -ENOMEM; | ||
| 566 | } | 565 | } |
| 566 | if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), | ||
| 567 | size, dmab) < 0) | ||
| 568 | return -ENOMEM; | ||
| 567 | return 0; | 569 | return 0; |
| 568 | } | 570 | } |
| 569 | 571 | ||
| 570 | static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci) | 572 | static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci) |
| 571 | { | 573 | { |
| 572 | if (dmab->area) | 574 | if (dmab->area) { |
| 575 | dmab->dev.dev = NULL; /* make it anonymous */ | ||
| 573 | snd_dma_reserve_buf(dmab, snd_dma_pci_buf_id(pci)); | 576 | snd_dma_reserve_buf(dmab, snd_dma_pci_buf_id(pci)); |
| 577 | } | ||
| 574 | } | 578 | } |
| 575 | 579 | ||
| 576 | 580 | ||
| @@ -4912,19 +4916,9 @@ static int __devinit hdsp_request_fw_loader(hdsp_t *hdsp) | |||
| 4912 | release_firmware(fw); | 4916 | release_firmware(fw); |
| 4913 | return -EINVAL; | 4917 | return -EINVAL; |
| 4914 | } | 4918 | } |
| 4915 | #ifdef SNDRV_BIG_ENDIAN | 4919 | |
| 4916 | { | ||
| 4917 | int i; | ||
| 4918 | u32 *src = (u32*)fw->data; | ||
| 4919 | for (i = 0; i < ARRAY_SIZE(hdsp->firmware_cache); i++, src++) | ||
| 4920 | hdsp->firmware_cache[i] = ((*src & 0x000000ff) << 16) | | ||
| 4921 | ((*src & 0x0000ff00) << 8) | | ||
| 4922 | ((*src & 0x00ff0000) >> 8) | | ||
| 4923 | ((*src & 0xff000000) >> 16); | ||
| 4924 | } | ||
| 4925 | #else | ||
| 4926 | memcpy(hdsp->firmware_cache, fw->data, sizeof(hdsp->firmware_cache)); | 4920 | memcpy(hdsp->firmware_cache, fw->data, sizeof(hdsp->firmware_cache)); |
| 4927 | #endif | 4921 | |
| 4928 | release_firmware(fw); | 4922 | release_firmware(fw); |
| 4929 | 4923 | ||
| 4930 | hdsp->state |= HDSP_FirmwareCached; | 4924 | hdsp->state |= HDSP_FirmwareCached; |
| @@ -5194,7 +5188,7 @@ static struct pci_driver driver = { | |||
| 5194 | 5188 | ||
| 5195 | static int __init alsa_card_hdsp_init(void) | 5189 | static int __init alsa_card_hdsp_init(void) |
| 5196 | { | 5190 | { |
| 5197 | return pci_module_init(&driver); | 5191 | return pci_register_driver(&driver); |
| 5198 | } | 5192 | } |
| 5199 | 5193 | ||
| 5200 | static void __exit alsa_card_hdsp_exit(void) | 5194 | static void __exit alsa_card_hdsp_exit(void) |