diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2007-09-17 11:33:37 +0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 18:50:26 +0400 |
| commit | c818e0a152bcb138411b07f4495b8e6fb9bacf52 (patch) | |
| tree | c019627e6099ac16b7ef0cf8bf0c4e7d7088eb6f | |
| parent | 2ea547dcdd4216370f00dd65a18ee5a0271646a0 (diff) | |
| download | linux-c818e0a152bcb138411b07f4495b8e6fb9bacf52.tar.xz | |
[ALSA] bt87x: fix detection of generic boards
Add an 'unknown' board type so that it is possible to differentiate
between unknown and generic boards.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| -rw-r--r-- | sound/pci/bt87x.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index 42e57fd02d39..91f9e6a112ff 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c @@ -149,6 +149,7 @@ MODULE_PARM_DESC(load_all, "Allow to load the non-whitelisted cards"); /* Cards with configuration information */ enum snd_bt87x_boardid { + SND_BT87X_BOARD_UNKNOWN, SND_BT87X_BOARD_GENERIC, /* both an & dig interfaces, 32kHz */ SND_BT87X_BOARD_ANALOG, /* board with no external A/D */ SND_BT87X_BOARD_OSPREY2x0, @@ -165,6 +166,9 @@ struct snd_bt87x_board { }; static const __devinitdata struct snd_bt87x_board snd_bt87x_boards[] = { + [SND_BT87X_BOARD_UNKNOWN] = { + .dig_rate = 32000, /* just a guess */ + }, [SND_BT87X_BOARD_GENERIC] = { .dig_rate = 32000, }, @@ -861,7 +865,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) snd_printk(KERN_DEBUG "please mail id, board name, and, " "if it works, the correct digital_rate option to " "<alsa-devel@alsa-project.org>\n"); - return SND_BT87X_BOARD_GENERIC; + return SND_BT87X_BOARD_UNKNOWN; } static int __devinit snd_bt87x_probe(struct pci_dev *pci, @@ -959,8 +963,8 @@ static void __devexit snd_bt87x_remove(struct pci_dev *pci) /* default entries for all Bt87x cards - it's not exported */ /* driver_data is set to 0 to call detection */ static struct pci_device_id snd_bt87x_default_ids[] __devinitdata = { - BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, GENERIC), - BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, GENERIC), + BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN), + BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, PCI_ANY_ID, PCI_ANY_ID, UNKNOWN), { } }; |