iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: most: sound: correct label name

Browse Source 
This patch fixes the lable name that is used to jump to error
handling section of function audio_probe_channel() in case
something went wrong.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2018-12-17 15:10:13 +01:00 committed by Greg Kroah-Hartman
parent 15600aea27
commit ba99c63181
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/most/sound/sound.c
View File

@ -625,7 +625,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,
ret = snd_card_new(&iface->dev, -1, card_name, THIS_MODULE,
sizeof(*channel), &adpt->card);
if (ret < 0)
goto err_free_card;
goto err_free_adpt;
snprintf(adpt->card->driver, sizeof(adpt->card->driver),
"%s", DRIVER_NAME);
snprintf(adpt->card->shortname, sizeof(adpt->card->shortname),
@ -650,7 +650,7 @@ skip_adpt_alloc:
channel = kzalloc(sizeof(*channel), GFP_KERNEL);
if (!channel) {
ret = -ENOMEM;
goto err_free_card;
goto err_free_adpt;
}
channel->card = adpt->card;
channel->cfg = cfg;
@ -662,13 +662,13 @@ skip_adpt_alloc:
ret = audio_set_hw_params(&channel->pcm_hardware, ch_num, sample_res,
cfg);
if (ret)
goto err_free_card;
goto err_free_adpt;
ret = snd_pcm_new(adpt->card, card_name, adpt->pcm_dev_idx,
playback_count, capture_count, &pcm);
if (ret < 0)
goto err_free_card;
goto err_free_adpt;
pcm->private_data = channel;
snprintf(pcm->name, sizeof(pcm->name), card_name);
@ -677,12 +677,12 @@ skip_adpt_alloc:
if (create) {
ret = snd_card_register(adpt->card);
if (ret < 0)
goto err_free_card;
goto err_free_adpt;
adpt->registered = true;
}
return 0;
err_free_card:
err_free_adpt:
release_adapter(adpt);
return ret;
}