mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
staging: most: sound: use static name for ALSA card
This patch uses a static name for the sound card's short name and long name. Having the card names configurable doesn't make sense anymore, as the card represents the same physical hardware. 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:
parent
4c6375dc1c
commit
6cebb20196
1 changed files with 2 additions and 2 deletions
|
@ -622,14 +622,14 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,
|
||||||
INIT_LIST_HEAD(&adpt->dev_list);
|
INIT_LIST_HEAD(&adpt->dev_list);
|
||||||
iface->priv = adpt;
|
iface->priv = adpt;
|
||||||
list_add_tail(&adpt->list, &adpt_list);
|
list_add_tail(&adpt->list, &adpt_list);
|
||||||
ret = snd_card_new(&iface->dev, -1, device_name, THIS_MODULE,
|
ret = snd_card_new(&iface->dev, -1, "INIC", THIS_MODULE,
|
||||||
sizeof(*channel), &adpt->card);
|
sizeof(*channel), &adpt->card);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_free_adpt;
|
goto err_free_adpt;
|
||||||
snprintf(adpt->card->driver, sizeof(adpt->card->driver),
|
snprintf(adpt->card->driver, sizeof(adpt->card->driver),
|
||||||
"%s", DRIVER_NAME);
|
"%s", DRIVER_NAME);
|
||||||
snprintf(adpt->card->shortname, sizeof(adpt->card->shortname),
|
snprintf(adpt->card->shortname, sizeof(adpt->card->shortname),
|
||||||
"Microchip MOST:%d", adpt->card->number);
|
"Microchip INIC");
|
||||||
snprintf(adpt->card->longname, sizeof(adpt->card->longname),
|
snprintf(adpt->card->longname, sizeof(adpt->card->longname),
|
||||||
"%s at %s, ch %d", adpt->card->shortname, iface->description,
|
"%s at %s, ch %d", adpt->card->shortname, iface->description,
|
||||||
channel_id);
|
channel_id);
|
||||||
|
|
Loading…
Reference in a new issue