]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: core: Fix return code shown on error for hw_params
authorJon Hunter <jonathanh@nvidia.com>
Wed, 30 May 2018 15:15:19 +0000 (16:15 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 30 May 2018 15:34:28 +0000 (16:34 +0100)
When the call to hw_params for a component fails, the error code is held
by the variable '__ret' but the error message displays the value held by
the variable 'ret'. Fix the return code shown when hw_params fails for
a component.

Fixes: b8135864d4d3 ("ASoC: snd_soc_component_driver has snd_pcm_ops")
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-pcm.c

index 0e2b2c6c60bd1deb238e91fb5e8a9babe40bf52b..5e7ae47a9658c3200241007b02d11b63bb45d429 100644 (file)
@@ -956,7 +956,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
                if (__ret < 0) {
                        dev_err(component->dev,
                                "ASoC: %s hw params failed: %d\n",
-                               component->name, ret);
+                               component->name, __ret);
                        ret = __ret;
                }
        }