Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Jul 23, 2013
2 parents 7c9e061 + b5c745f commit 60886e1
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 60886e1

Please sign in to comment.