snd_dma_pci_data(chip->pci),
byte_size, bufp);
if (err < 0)
- goto error;
+ goto unlock;
+ mark_pages_wc(chip, bufp, true);
azx_dev = azx_get_dsp_loader_dev(chip);
azx_dev->bufsize = byte_size;
azx_dev->period_bytes = byte_size;
return azx_dev->stream_tag;
error:
+ mark_pages_wc(chip, bufp, false);
+ snd_dma_free_pages(bufp);
+unlock:
snd_hda_unlock_devices(bus);
return err;
}
struct azx *chip = bus->private_data;
struct azx_dev *azx_dev = azx_get_dsp_loader_dev(chip);
+ if (!dmab->area)
+ return;
+
/* reset BDL address */
azx_sd_writel(azx_dev, SD_BDLPL, 0);
azx_sd_writel(azx_dev, SD_BDLPU, 0);
azx_dev->period_bytes = 0;
azx_dev->format_val = 0;
+ mark_pages_wc(chip, dmab, false);
snd_dma_free_pages(dmab);
+ dmab->area = NULL;
snd_hda_unlock_devices(bus);
}
struct ca0132_spec *spec = codec->spec;
int status;
- if (dma->dmab)
+ if (dma->dmab->area)
snd_hda_codec_load_dsp_cleanup(codec, dma->dmab);
status = snd_hda_codec_load_dsp_prepare(codec,
chip_addx_remainder,
data_remainder,
remainder_words);
+ if (status < 0)
+ return status;
remainder_words = 0;
}
if (hci_write) {
status = dspxfr_hci_write(codec, hci_write);
+ if (status < 0)
+ return status;
hci_write = NULL;
}
snd_printdd(KERN_INFO "+++++ DMA complete");
dma_set_state(dma_engine, DMA_STATE_STOP);
- dma_reset(dma_engine);
+ status = dma_reset(dma_engine);
if (status < 0)
return status;
if (ovly && (dma_chan != INVALID_DMA_CHANNEL))
dspio_free_dma_chan(codec, dma_chan);
- if (dma_engine->dmab)
+ if (dma_engine->dmab->area)
snd_hda_codec_load_dsp_cleanup(codec, dma_engine->dmab);
kfree(dma_engine->dmab);
kfree(dma_engine);