From: Trent Piepho Date: Thu, 18 Oct 2007 08:48:43 +0000 (+0200) Subject: [ALSA] snd-bt87x: Make the load_all option work correctly X-Git-Tag: v2.6.24-rc1~35^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8e84c6413a2bec1c3e67bb38d42422f9f3262c10;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- 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;