Browse Source

Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

Mark Brown 12 years ago
parent
commit
60886e16b4
1 changed files with 1 additions and 3 deletions
  1. 1 3
      sound/soc/soc-core.c

+ 1 - 3
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 */
 	/* create platform component name */
 	platform->name = fmt_single_name(dev, &platform->id);
 	platform->name = fmt_single_name(dev, &platform->id);
-	if (platform->name == NULL) {
-		kfree(platform);
+	if (platform->name == NULL)
 		return -ENOMEM;
 		return -ENOMEM;
-	}
 
 
 	platform->dev = dev;
 	platform->dev = dev;
 	platform->driver = platform_drv;
 	platform->driver = platform_drv;