diff options
| author | Mark Brown | 2015-04-12 19:48:20 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-04-12 19:48:20 +0100 |
| commit | a55ede1661268c1a6fe94078b7b08906dfa7b77a (patch) | |
| tree | fe46be595fc52803a74b3e081a01ec247eb5ac1c /sound/soc/intel/sst/sst_acpi.c | |
| parent | dad0e523ede5a6d2d20c54d0e179b36a54a9953b (diff) | |
| parent | 6212755eff3171e0211bb6a9f4706e115217588c (diff) | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound/soc/intel/sst/sst_acpi.c')
| -rw-r--r-- | sound/soc/intel/sst/sst_acpi.c | 2 |
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 b782dfdcdbba..b536ddd2517d 100644 --- a/sound/soc/intel/sst/sst_acpi.c +++ b/sound/soc/intel/sst/sst_acpi.c @@ -309,7 +309,7 @@ static 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; } |