summaryrefslogtreecommitdiffstats
path: root/sound/i2c/other
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2011-05-12 22:18:22 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-13 19:43:24 +0200
commit10ca72014741554ad37c149ff0d9e93c1e3d5b7d (patch)
tree697fc1987e7ac705dbb1fbfc1211e9e3e988d576 /sound/i2c/other
parentALSA: tea575x: remove unused card from struct (diff)
downloadlinux-10ca72014741554ad37c149ff0d9e93c1e3d5b7d.tar.xz
linux-10ca72014741554ad37c149ff0d9e93c1e3d5b7d.zip
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/i2c/other')
-rw-r--r--sound/i2c/other/tea575x-tuner.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 98ccec27e7bf..4831800239d3 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/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;