[ALSA] hda-codec - add snd_hda_codec_stereo() function

[linux-2.6-omap-h63xx.git] / sound / pci / bt87x.c

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 6523ba07db963eca79b03126eee27b5244f63576..f0e12985dc29b7d2ec0e1e9c3007405e1c4d1635 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -157,7 +157,7 @@ struct snd_bt87x {
        int dig_rate;
 
        spinlock_t reg_lock;
-       long opened;
+       unsigned long opened;
        struct snd_pcm_substream *substream;
 
        struct snd_dma_buffer dma_risc;
@@ -569,15 +569,7 @@ static struct snd_kcontrol_new snd_bt87x_capture_volume = {
        .put = snd_bt87x_capture_volume_put,
 };
 
-static int snd_bt87x_capture_boost_info(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_info *info)
-{
-       info->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-       info->count = 1;
-       info->value.integer.min = 0;
-       info->value.integer.max = 1;
-       return 0;
-}
+#define snd_bt87x_capture_boost_info   snd_ctl_boolean_mono_info
 
 static int snd_bt87x_capture_boost_get(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *value)
@@ -781,6 +773,8 @@ static struct pci_device_id snd_bt87x_ids[] = {
        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_879, 0x0070, 0x13eb, 32000),
        /* Viewcast Osprey 200 */
        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff01, 44100),
+       /* Viewcast Osprey 440 (rate is configurable via gpio) */
+       BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x0070, 0xff07, 32000),
        /* ATI TV-Wonder */
        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1002, 0x0001, 32000),
        /* Leadtek Winfast tv 2000xp delux */