aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2015-03-18 21:31:38 +0530
committerMark Brown <broonie@kernel.org>2015-03-19 00:57:10 +0000
commitbdc455b512c880292d7f145e73aed5e37a90f6e4 (patch)
tree5f933593c72329045f95b860cb60024b90f7240a /sound/soc/intel
parentASoC: Intel: remove conflicts when load/unload multiple firmware images (diff)
downloadlinux-dev-bdc455b512c880292d7f145e73aed5e37a90f6e4.tar.xz
linux-dev-bdc455b512c880292d7f145e73aed5e37a90f6e4.zip
ASoC: Intel: acpi_probe: fix error return path
Fix the sst_acpi_probe memory allocation error path by setting right error code and initiating the cleanup insteadof just returning Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
-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 b3360139c41a..98c2444dece3 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -309,7 +309,7 @@ int sst_acpi_probe(struct platform_device *pdev)
ctx->shim_regs64 = devm_kzalloc(ctx->dev, sizeof(*ctx->shim_regs64),
GFP_KERNEL);
if (!ctx->shim_regs64) {
- return -ENOMEM;
+ ret = -ENOMEM;
goto do_sst_cleanup;
}