[alsa-devel] [PATCH 1/2] ASoC: Intel: Rename SST trace event header to be less generic.
The Intel audio DSP SST trace event header has been renamed from sst.h to intel-sst.h in order to avoid any confusion with any future Samoa Standard Time drivers ;)
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- include/trace/events/{sst.h => intel-sst.h} | 0 sound/soc/intel/sst-dsp.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename include/trace/events/{sst.h => intel-sst.h} (100%)
diff --git a/include/trace/events/sst.h b/include/trace/events/intel-sst.h similarity index 100% rename from include/trace/events/sst.h rename to include/trace/events/intel-sst.h diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/sst-dsp.c index 1888de5..e0ad2e5 100644 --- a/sound/soc/intel/sst-dsp.c +++ b/sound/soc/intel/sst-dsp.c @@ -24,7 +24,7 @@ #include "sst-dsp-priv.h"
#define CREATE_TRACE_POINTS -#include <trace/events/sst.h> +#include <trace/events/intel-sst.h>
/* Public API */ void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value)
Add GFP_KERNEL when allocating firmware DMA buffer.
Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- sound/soc/intel/sst-firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c index b6f9b5e..31cd154 100644 --- a/sound/soc/intel/sst-firmware.c +++ b/sound/soc/intel/sst-firmware.c @@ -65,7 +65,7 @@ struct sst_fw *sst_fw_new(struct sst_dsp *dsp,
/* allocate DMA buffer to store FW data */ sst_fw->dma_buf = dma_alloc_coherent(dsp->dev, sst_fw->size, - &sst_fw->dmable_fw_paddr, GFP_DMA); + &sst_fw->dmable_fw_paddr, GFP_DMA | GFP_KERNEL); if (!sst_fw->dma_buf) { dev_err(dsp->dev, "error: DMA alloc failed\n"); kfree(sst_fw);
On Tue, 2014-02-18 at 10:41 +0000, Liam Girdwood wrote:
The Intel audio DSP SST trace event header has been renamed from sst.h to intel-sst.h in order to avoid any confusion with any future Samoa Standard Time drivers ;)
bah, I'll need to resend this one. It passed module build, but failed on built-in (as I had built-in the driver for some other tests).
Liam
participants (2)
-
Liam Girdwood
-
Mark Brown