From 7d87c22b2c2af68c8e1a59119ee752cfdec2e7fb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 14 Apr 2009 13:32:57 -0300 Subject: backport commit e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 From: Mauro Carvalho Chehab kernel-sync: Author: Takashi Iwai Date: Sun Dec 28 16:44:30 2008 +0100 ALSA: Convert to snd_card_create() in sound/pci/* Convert from snd_card_new() to the new snd_card_create() function in sound/pci/*. Signed-off-by: Mauro Carvalho Chehab --- linux/sound/pci/bt87x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/sound/pci/bt87x.c') diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 8b6868462..11b10d70e 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -914,9 +914,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci, return -ENOENT; } - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (!card) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; err = snd_bt87x_create(card, pci, &chip); if (err < 0) -- cgit v1.2.3 From d46eed926528e6e3ddb52d87a9a58fb7914937ba Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 16 Jun 2009 18:40:19 -0300 Subject: sound/pci/bt87x: backport git commits 3f08a0e4ab1ce65 and 2008f137e92220 From: Mauro Carvalho Chehab kernel-sync: commit 3f08a0e4ab1ce65bb882f6425ff482e5db025f78 Author: Takashi Iwai 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 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 --- linux/sound/pci/bt87x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'linux/sound/pci/bt87x.c') 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 */ -- cgit v1.2.3