aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/atom/sst
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-04-08 18:08:09 +0200
committerTakashi Iwai <tiwai@suse.de>2020-04-08 18:08:09 +0200
commitddd5609fe8b682fbe81f71b27561f14d3611d856 (patch)
treed72d453180c0c25990524813a6b54a0555453d5e /sound/soc/intel/atom/sst
parentALSA: hda: Add driver blacklist (diff)
parentASoC: cs4270: pull reset GPIO low then high (diff)
downloadlinux-dev-ddd5609fe8b682fbe81f71b27561f14d3611d856.tar.xz
linux-dev-ddd5609fe8b682fbe81f71b27561f14d3611d856.zip
Merge tag 'asoc-fix-v5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.7 A collection of fixes that have been accumilated since the merge window, mainly relating to x86 platform support.
Diffstat (limited to 'sound/soc/intel/atom/sst')
-rw-r--r--sound/soc/intel/atom/sst/sst_pvt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index 13db2854db3e..053c27707147 100644
--- a/sound/soc/intel/atom/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -223,9 +223,9 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst,
size_t mbox_data_len, const void *mbox_data, void **data,
bool large, bool fill_dsp, bool sync, bool response)
{
+ struct sst_block *block = NULL;
struct ipc_post *msg = NULL;
struct ipc_dsp_hdr dsp_hdr;
- struct sst_block *block;
int ret = 0, pvt_id;
pvt_id = sst_assign_pvt_id(sst);