diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-09 09:30:41 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-09 09:30:41 +0400 |
| commit | fd1a2a90d08b0052fa52bd36cebd0592c9e537c2 (patch) | |
| tree | 6a0d03afeb4476803ac37c66b6fa7fb4c03aa5a2 /sound/soc/fsl/imx-es8328.c | |
| parent | c497d9f917542a71e1654b31368d18153b6f1987 (diff) | |
| parent | bdf20b4291eaa3b327398b8dd330065ad8e6d3ce (diff) | |
| download | linux-fd1a2a90d08b0052fa52bd36cebd0592c9e537c2.tar.xz | |
Merge tag 'asoc-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.18
A few small fixes, mostly small although a few really nasty ones like
the interaction between GPIO 0 and simple-card.
Diffstat (limited to 'sound/soc/fsl/imx-es8328.c')
| -rw-r--r-- | sound/soc/fsl/imx-es8328.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c index 653e66d150c8..f8cf10e16ce9 100644 --- a/sound/soc/fsl/imx-es8328.c +++ b/sound/soc/fsl/imx-es8328.c @@ -78,7 +78,7 @@ static const struct snd_soc_dapm_widget imx_es8328_dapm_widgets[] = { static int imx_es8328_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - struct device_node *ssi_np, *codec_np; + struct device_node *ssi_np = NULL, *codec_np = NULL; struct platform_device *ssi_pdev; struct imx_es8328_data *data; u32 int_port, ext_port; @@ -104,6 +104,7 @@ static int imx_es8328_probe(struct platform_device *pdev) if (ext_port > MUX_PORT_MAX || ext_port == 0) { dev_err(dev, "mux-ext-port: hardware only has %d mux ports\n", MUX_PORT_MAX); + ret = -EINVAL; goto fail; } |