diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:40:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:40:19 -0300 |
| commit | d46eed926528e6e3ddb52d87a9a58fb7914937ba (patch) | |
| tree | 4b2f09f6e6ef46377ca081d68716dedd98db7083 | |
| parent | 28f0a28c5e0c37bee44d914bde9533d5fc16b62d (diff) | |
| download | mediapointer-dvb-s2-d46eed926528e6e3ddb52d87a9a58fb7914937ba.tar.gz mediapointer-dvb-s2-d46eed926528e6e3ddb52d87a9a58fb7914937ba.tar.bz2 | |
sound/pci/bt87x: backport git commits 3f08a0e4ab1ce65 and 2008f137e92220
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
commit 3f08a0e4ab1ce65bb882f6425ff482e5db025f78
Author: Takashi Iwai <tiwai@suse.de>
Date: Tue Jun 2 17:39:52 2009 +0200
ALSA: bt87x - Add a quirk entry for Askey Computer Corp. MagicTView'99
commit 2008f137e92220b98120c4803499cdddb2b0fb06
Author: Takashi Iwai <tiwai@suse.de>
Date: Tue Apr 28 12:25:59 2009 +0200
ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers
Added SNDRV_PCM_INFO_BATCH flag to PCM info field of some drivers that
really don't give the precise pointer value.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/sound/pci/bt87x.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 11b10d70e..59e73e2b0 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -375,7 +375,8 @@ static struct snd_pcm_hardware snd_bt87x_digital_hw = { .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | - SNDRV_PCM_INFO_MMAP_VALID, + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_BATCH, .formats = SNDRV_PCM_FMTBIT_S16_LE, .rates = 0, /* set at runtime */ .channels_min = 2, @@ -391,7 +392,8 @@ static struct snd_pcm_hardware snd_bt87x_analog_hw = { .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | - SNDRV_PCM_INFO_MMAP_VALID, + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_BATCH, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8, .rates = SNDRV_PCM_RATE_KNOT, .rate_min = ANALOG_CLOCK / CLOCK_DIV_MAX, @@ -834,6 +836,8 @@ static struct pci_device_id snd_bt87x_ids[] = { BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC), /* Voodoo TV 200 */ BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC), + /* Askey Computer Corp. MagicTView'99 */ + BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x144f, 0x3000, GENERIC), /* AVerMedia Studio No. 103, 203, ...? */ BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, AVPHONE98), /* Prolink PixelView PV-M4900 */ |