diff options
author | Christian Gromm <christian.gromm@microchip.com> | 2018-12-17 17:10:13 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-17 18:10:20 +0300 |
commit | ba99c631810bd9aef2fc7e62420d77371d2d04f5 (patch) | |
tree | 9f2f155a5bd47d1dd8f636f87c83023abb69ced8 /drivers/staging/most/sound | |
parent | 15600aea2754c3f0cd3440b95b91bbf1602a3fca (diff) | |
download | linux-ba99c631810bd9aef2fc7e62420d77371d2d04f5.tar.xz |
staging: most: sound: correct label name
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>
Diffstat (limited to 'drivers/staging/most/sound')
-rw-r--r-- | drivers/staging/most/sound/sound.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c index 9f848080330c..0e9377f96b63 100644 --- a/drivers/staging/most/sound/sound.c +++ b/drivers/staging/most/sound/sound.c @@ -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; } |