ASoC: Intel: sst-acpi: Fix Oops in case of missing firmware
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Tue, 25 Feb 2014 14:37:47 +0000 (16:37 +0200)
committerMark Brown <broonie@linaro.org>
Tue, 25 Feb 2014 23:45:35 +0000 (08:45 +0900)
commit5069e5c93ca73eab185d3bb338a1362275f9ea70
treec0d347fab5362f85101fba760178e3cebd438319
parent20df8d03a7a6d71cc8c1fe54cf2c69b2d416423f
ASoC: Intel: sst-acpi: Fix Oops in case of missing firmware

I swear I tested missing firmware in commit e5161d7987f1 ("ASoC: Intel:
sst-acpi: Request firmware before SST platform driver probing").

Unfortunately same wasn't done in commit 6dda27cbbd1d ("ASoC: Intel:
sst-acpi: Add support for multiple machine drivers per platform") which
will cause NULL pointer dereference in sst_acpi_fw_cb() when printing the
error since sst_acpi->mach is not set.

Fix this obvious error by setting the sst_acpi->mach in sst_acpi_probe().

Reported-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/intel/sst-acpi.c