diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2007-10-16 14:59:11 -0700 |
|---|---|---|
| committer | Clemens Ladisch <clemens@ladisch.de> | 2007-10-16 14:59:11 -0700 |
| commit | 0ac81e8228715c26c7dbd6e57ea910f570741774 (patch) | |
| tree | da53e1298e0e01ab538b61e5d8a0b0ee22853c23 /linux/sound | |
| parent | 2e6989cc888ef555e61e9b4226054c278a2647b0 (diff) | |
| download | mediapointer-dvb-s2-0ac81e8228715c26c7dbd6e57ea910f570741774.tar.gz mediapointer-dvb-s2-0ac81e8228715c26c7dbd6e57ea910f570741774.tar.bz2 | |
Backport kernel commit c818e0a152bcb138411b07f4495b8e6fb9bacf52
ALSA HG commit 5401
Date: Mon, 17 Sep 2007 07:33:37 +0000 (+0200)
[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>
Diffstat (limited to 'linux/sound')
| -rw-r--r-- | linux/sound/pci/bt87x.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 1e435002e..6214d8209 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -165,6 +165,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, @@ -181,6 +182,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, }, @@ -893,7 +897,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, @@ -991,8 +995,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), { } }; |