summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-10-18 10:48:43 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-23 08:04:34 +0200
commit8e84c6413a2bec1c3e67bb38d42422f9f3262c10 (patch)
tree3c52f3e2078f613080a9a5b69f70d719a0f87620 /sound
parent44e0b6821d7eacb4f93d2c131d436f96e500aa08 (diff)
[ALSA] snd-bt87x: Make the load_all option work correctly
If the load_all option was turned on all cards would be treated as unknown, even those which are in the database. Of course, if the card is in the database there is no reason to use the load_all option. It's there to force loading when the card isn't in the database. But there are out of date wikis that say to do this and some distros might turn this option on by default. So, we keep the load_all option from turning known cards into unknown cards. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/bt87x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index f960b8209d1..2dba752faf4 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -848,7 +848,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci)
int i;
const struct pci_device_id *supported;
- supported = pci_match_device(&driver, pci);
+ supported = pci_match_id(snd_bt87x_ids, pci);
if (supported && supported->driver_data > 0)
return supported->driver_data;