diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-23 19:17:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-23 19:17:07 +0100 |
| commit | 60886e16b41e998aef284454674f8428fc15e875 (patch) | |
| tree | 7d702a7597edb7fa2e4fe0c70ad3f01e95c109ab | |
| parent | 7c9e061729c0c612f57fe27b7e72cde308263cf0 (diff) | |
| parent | b5c745fb75b7e5ab06e9c99d63427595a234cc89 (diff) | |
| download | linux-60886e16b41e998aef284454674f8428fc15e875.tar.gz linux-60886e16b41e998aef284454674f8428fc15e875.tar.xz | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0ec070cf7231..d82ee386eab5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3908,10 +3908,8 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform, { /* create platform component name */ platform->name = fmt_single_name(dev, &platform->id); - if (platform->name == NULL) { - kfree(platform); + if (platform->name == NULL) return -ENOMEM; - } platform->dev = dev; platform->driver = platform_drv; |