diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-27 10:40:03 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-27 10:40:03 -0400 |
| commit | dc1632321ba1e93dde25870e96cebe21b7d52517 (patch) | |
| tree | d52d934c79b23f91654c571d983e1a6ec41b71fd /sound/soc/soc-core.c | |
| parent | 8c193b8dce4f2a2474dc2bc39ec972454df9d439 (diff) | |
| parent | a85f9da707366e856c0aad9e329db0cc59475290 (diff) | |
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
Diffstat (limited to 'sound/soc/soc-core.c')
| -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 9375012ccb21..d476f752e3f1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -3860,10 +3860,8 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform, | |||
| 3860 | { | 3860 | { |
| 3861 | /* create platform component name */ | 3861 | /* create platform component name */ |
| 3862 | platform->name = fmt_single_name(dev, &platform->id); | 3862 | platform->name = fmt_single_name(dev, &platform->id); |
| 3863 | if (platform->name == NULL) { | 3863 | if (platform->name == NULL) |
| 3864 | kfree(platform); | ||
| 3865 | return -ENOMEM; | 3864 | return -ENOMEM; |
| 3866 | } | ||
| 3867 | 3865 | ||
| 3868 | platform->dev = dev; | 3866 | platform->dev = dev; |
| 3869 | platform->driver = platform_drv; | 3867 | platform->driver = platform_drv; |