From e5ab3a7c00e682e0e24677203856769df1b9b0cb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 17 Oct 2007 10:35:58 +0200 Subject: [ALSA] bt87x - Fix section mismatch const and __devinit aren't a good pair, resulting in a section mismatch error. Let's remove const as a temporary solution. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/pci/bt87x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/pci/bt87x.c') diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 91f9e6a112ff..f960b8209d1b 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c @@ -165,7 +165,7 @@ struct snd_bt87x_board { unsigned no_digital:1; /* No digital input */ }; -static const __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = { +static __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = { [SND_BT87X_BOARD_UNKNOWN] = { .dig_rate = 32000, /* just a guess */ }, -- cgit v1.2.2 From 8e84c6413a2bec1c3e67bb38d42422f9f3262c10 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Thu, 18 Oct 2007 10:48:43 +0200 Subject: [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 --- sound/pci/bt87x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/pci/bt87x.c') diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index f960b8209d1b..2dba752faf4e 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; -- cgit v1.2.2