diff options
Diffstat (limited to 'sound/soc/intel/sst-firmware.c')
-rw-r--r-- | sound/soc/intel/sst-firmware.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c index 5fed75cef64f..c38cfda8003c 100644 --- a/sound/soc/intel/sst-firmware.c +++ b/sound/soc/intel/sst-firmware.c | |||
@@ -57,14 +57,8 @@ struct sst_fw *sst_fw_new(struct sst_dsp *dsp, | |||
57 | sst_fw->private = private; | 57 | sst_fw->private = private; |
58 | sst_fw->size = fw->size; | 58 | sst_fw->size = fw->size; |
59 | 59 | ||
60 | err = dma_coerce_mask_and_coherent(dsp->dev, DMA_BIT_MASK(32)); | ||
61 | if (err < 0) { | ||
62 | kfree(sst_fw); | ||
63 | return NULL; | ||
64 | } | ||
65 | |||
66 | /* allocate DMA buffer to store FW data */ | 60 | /* allocate DMA buffer to store FW data */ |
67 | sst_fw->dma_buf = dma_alloc_coherent(dsp->dev, sst_fw->size, | 61 | sst_fw->dma_buf = dma_alloc_coherent(dsp->dma_dev, sst_fw->size, |
68 | &sst_fw->dmable_fw_paddr, GFP_DMA | GFP_KERNEL); | 62 | &sst_fw->dmable_fw_paddr, GFP_DMA | GFP_KERNEL); |
69 | if (!sst_fw->dma_buf) { | 63 | if (!sst_fw->dma_buf) { |
70 | dev_err(dsp->dev, "error: DMA alloc failed\n"); | 64 | dev_err(dsp->dev, "error: DMA alloc failed\n"); |
@@ -106,7 +100,7 @@ void sst_fw_free(struct sst_fw *sst_fw) | |||
106 | list_del(&sst_fw->list); | 100 | list_del(&sst_fw->list); |
107 | mutex_unlock(&dsp->mutex); | 101 | mutex_unlock(&dsp->mutex); |
108 | 102 | ||
109 | dma_free_coherent(dsp->dev, sst_fw->size, sst_fw->dma_buf, | 103 | dma_free_coherent(dsp->dma_dev, sst_fw->size, sst_fw->dma_buf, |
110 | sst_fw->dmable_fw_paddr); | 104 | sst_fw->dmable_fw_paddr); |
111 | kfree(sst_fw); | 105 | kfree(sst_fw); |
112 | } | 106 | } |