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

This commit is contained in:
Mark Brown 2013-07-23 19:17:07 +01:00
commit 60886e16b4

View File

@ -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;