Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core

2013-08-27 15:40:03 +01:00
parent 8c193b8dce a85f9da707
commit dc1632321b
1700 changed files with 18580 additions and 103059 deletions
--- 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,
 {
 	/* 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;