summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2011-05-13 00:18:22 +0400
committerTakashi Iwai <tiwai@suse.de>2011-05-13 21:43:24 +0400
commit10ca72014741554ad37c149ff0d9e93c1e3d5b7d (patch)
tree697fc1987e7ac705dbb1fbfc1211e9e3e988d576 /sound/pci
parent3d11ba5593b801b1db85e9680d585713e6039112 (diff)
downloadlinux-10ca72014741554ad37c149ff0d9e93c1e3d5b7d.tar.xz
ALSA: tea575x: use better card and bus names
Provide real card and bus_info instead of hardcoded values. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/es1968.c2
-rw-r--r--sound/pci/fm801.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index ec7f8371a812..ab0a6156a704 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2795,6 +2795,8 @@ static int __devinit snd_es1968_create(struct snd_card *card,
#ifdef CONFIG_SND_ES1968_RADIO
chip->tea.private_data = chip;
chip->tea.ops = &snd_es1968_tea_ops;
+ strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));
+ sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
if (!snd_tea575x_init(&chip->tea))
printk(KERN_INFO "es1968: detected TEA575x radio\n");
#endif
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index ae5c270bfa7d..05553da2f6cf 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1232,6 +1232,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
#ifdef TEA575X_RADIO
chip->tea.private_data = chip;
chip->tea.ops = &snd_fm801_tea_ops;
+ sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 &&
(tea575x_tuner & TUNER_TYPE_MASK) < 4) {
if (snd_tea575x_init(&chip->tea))
@@ -1246,6 +1247,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
break;
}
}
+ strlcpy(chip->tea.card, snd_fm801_tea575x_gpios[(tea575x_tuner & TUNER_TYPE_MASK) - 1].name, sizeof(chip->tea.card));
#endif
*rchip = chip;