mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 05:24:12 +08:00
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
This commit is contained in:
commit
60886e16b4
@ -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) {
|
if (platform->name == NULL)
|
||||||
kfree(platform);
|
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
|
|
||||||
platform->dev = dev;
|
platform->dev = dev;
|
||||||
platform->driver = platform_drv;
|
platform->driver = platform_drv;
|
||||||
|
Loading…
Reference in New Issue
Block a user