aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKevin Strasser <kevin.strasser@linux.intel.com>2014-12-15 19:15:04 -0500
committerMark Brown <broonie@kernel.org>2014-12-16 06:52:09 -0500
commitde5f644e3ca71afc06377d137375c56e250f8cb3 (patch)
tree4d66cf13a6bd7a47bdb9b3153122a1e2d6b22907 /sound/soc
parentf5d40b400fe2de5f9dc3d41681cc59b2b7c28f8c (diff)
ASoC: Intel: fix possible acpi enumeration panic
A crash can occur on some platforms where adsp is enumerated but codec is not matched. Define codec_id as a pointer intead of an array so that it gets initialized to NULL for the terminating element of sst_acpi_bytcr[] and sst_acpi_chv[]. Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/intel/sst/sst_acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index f59972a28d24..3abc29e8a928 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -43,7 +43,7 @@
43#include "sst.h" 43#include "sst.h"
44 44
45struct sst_machines { 45struct sst_machines {
46 char codec_id[32]; 46 char *codec_id;
47 char board[32]; 47 char board[32];
48 char machine[32]; 48 char machine[32];
49 void (*machine_quirk)(void); 49 void (*machine_quirk)(void);