From ee3008898f5627ada97b1d5b532eb8044eae96d8 Mon Sep 17 00:00:00 2001
From: Ondrej Zary <linux@rainbow-software.org>
Date: Thu, 12 May 2011 22:18:22 +0200
Subject: [PATCH] --- yaml --- r: 248180 b: refs/heads/master c:
 10ca72014741554ad37c149ff0d9e93c1e3d5b7d h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/include/sound/tea575x-tuner.h   | 2 ++
 trunk/sound/i2c/other/tea575x-tuner.c | 5 +++--
 trunk/sound/pci/es1968.c              | 2 ++
 trunk/sound/pci/fm801.c               | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7b84a5b7dc16..6b1dfa136b34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d11ba5593b801b1db85e9680d585713e6039112
+refs/heads/master: 10ca72014741554ad37c149ff0d9e93c1e3d5b7d
diff --git a/trunk/include/sound/tea575x-tuner.h b/trunk/include/sound/tea575x-tuner.h
index 42ce8cd7616f..d2ea112fc20f 100644
--- a/trunk/include/sound/tea575x-tuner.h
+++ b/trunk/include/sound/tea575x-tuner.h
@@ -52,6 +52,8 @@ struct snd_tea575x {
 	unsigned long in_use;		/* set if the device is in use */
 	struct snd_tea575x_ops *ops;
 	void *private_data;
+	u8 card[32];
+	u8 bus_info[32];
 };
 
 int snd_tea575x_init(struct snd_tea575x *tea);
diff --git a/trunk/sound/i2c/other/tea575x-tuner.c b/trunk/sound/i2c/other/tea575x-tuner.c
index 98ccec27e7bf..4831800239d3 100644
--- a/trunk/sound/i2c/other/tea575x-tuner.c
+++ b/trunk/sound/i2c/other/tea575x-tuner.c
@@ -178,8 +178,9 @@ static int vidioc_querycap(struct file *file, void  *priv,
 	struct snd_tea575x *tea = video_drvdata(file);
 
 	strlcpy(v->driver, "tea575x-tuner", sizeof(v->driver));
-	strlcpy(v->card, tea->tea5759 ? "TEA5759" : "TEA5757", sizeof(v->card));
-	sprintf(v->bus_info, "PCI");
+	strlcpy(v->card, tea->card, sizeof(v->card));
+	strlcat(v->card, tea->tea5759 ? " TEA5759" : " TEA5757", sizeof(v->card));
+	strlcpy(v->bus_info, tea->bus_info, sizeof(v->bus_info));
 	v->version = RADIO_VERSION;
 	v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
 	return 0;
diff --git a/trunk/sound/pci/es1968.c b/trunk/sound/pci/es1968.c
index ec7f8371a812..ab0a6156a704 100644
--- a/trunk/sound/pci/es1968.c
+++ b/trunk/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/trunk/sound/pci/fm801.c b/trunk/sound/pci/fm801.c
index ae5c270bfa7d..05553da2f6cf 100644
--- a/trunk/sound/pci/fm801.c
+++ b/trunk/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;