mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
[media] sound/usb: Use meaninful names for goto labels
Fix to use meaningful names instead of numbered goto labels Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
9532e6bbef
commit
c0fd9cdf94
1 changed files with 8 additions and 8 deletions
|
@ -84,21 +84,21 @@ int media_snd_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
|
|||
ret = media_device_register_entity(mctl->media_dev,
|
||||
&mctl->media_entity);
|
||||
if (ret)
|
||||
goto err1;
|
||||
goto free_mctl;
|
||||
|
||||
mctl->intf_devnode = media_devnode_create(mdev, intf_type, 0,
|
||||
MAJOR(pcm_dev->devt),
|
||||
MINOR(pcm_dev->devt));
|
||||
if (!mctl->intf_devnode) {
|
||||
ret = -ENOMEM;
|
||||
goto err2;
|
||||
goto unregister_entity;
|
||||
}
|
||||
mctl->intf_link = media_create_intf_link(&mctl->media_entity,
|
||||
&mctl->intf_devnode->intf,
|
||||
MEDIA_LNK_FL_ENABLED);
|
||||
if (!mctl->intf_link) {
|
||||
ret = -ENOMEM;
|
||||
goto err3;
|
||||
goto devnode_remove;
|
||||
}
|
||||
|
||||
/* create link between mixer and audio */
|
||||
|
@ -109,7 +109,7 @@ int media_snd_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
|
|||
&mctl->media_entity, 0,
|
||||
MEDIA_LNK_FL_ENABLED);
|
||||
if (ret)
|
||||
goto err4;
|
||||
goto remove_intf_link;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -117,13 +117,13 @@ int media_snd_stream_init(struct snd_usb_substream *subs, struct snd_pcm *pcm,
|
|||
subs->media_ctl = mctl;
|
||||
return 0;
|
||||
|
||||
err4:
|
||||
remove_intf_link:
|
||||
media_remove_intf_link(mctl->intf_link);
|
||||
err3:
|
||||
devnode_remove:
|
||||
media_devnode_remove(mctl->intf_devnode);
|
||||
err2:
|
||||
unregister_entity:
|
||||
media_device_unregister_entity(&mctl->media_entity);
|
||||
err1:
|
||||
free_mctl:
|
||||
kfree(mctl);
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue