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

60886e16 · Mark Brown · 7c9e0617 · b5c745fb · 60886e16
Commit 60886e16 authored Jul 23, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

sound/soc/soc-core.c sound/soc/soc-core.c +1 -3

No files found.
--- 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;