1 files changed, 27 insertions, 33 deletions

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 6781be9e3078..1aafe956ee2b 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -313,6 +313,7 @@ struct snd_via_sg_table {
 } ;
 
 #define VIA_TABLE_SIZE  255
+#define VIA_MAX_BUFSIZE (1<<24)
 
 struct viadev {
         unsigned int reg_offset;
@@ -420,7 +421,6 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
 {
         unsigned int i, idx, ofs, rest;
         struct via82xx *chip = snd_pcm_substream_chip(substream);
-        struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
 
         if (dev->table.area == NULL) {
                 /* the start of each lists must be aligned to 8 bytes,
@@ -449,15 +449,15 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
                 do {
                         unsigned int r;
                         unsigned int flag;
+                        unsigned int addr;
 
                         if (idx >= VIA_TABLE_SIZE) {
                                 snd_printk(KERN_ERR "via82xx: too much table size!\n");
                                 return -EINVAL;
                         }
-                        ((u32 *)dev->table.area)[idx << 1] = cpu_to_le32((u32)snd_pcm_sgbuf_get_addr(sgbuf, ofs));
-                        r = PAGE_SIZE - (ofs % PAGE_SIZE);
-                        if (rest < r)
-                                r = rest;
+                        addr = snd_pcm_sgbuf_get_addr(substream, ofs);
+                        ((u32 *)dev->table.area)[idx << 1] = cpu_to_le32(addr);
+                        r = snd_pcm_sgbuf_get_chunk_size(substream, ofs, rest);
                         rest -= r;
                         if (! rest) {
                                 if (i == periods - 1)
@@ -824,7 +824,8 @@ static snd_pcm_uframes_t snd_via686_pcm_pointer(struct snd_pcm_substream *substr
         struct viadev *viadev = substream->runtime->private_data;
         unsigned int idx, ptr, count, res;
 
-        snd_assert(viadev->tbl_entries, return 0);
+        if (snd_BUG_ON(!viadev->tbl_entries))
+                return 0;
         if (!(inb(VIADEV_REG(viadev, OFFSET_STATUS)) & VIA_REG_STAT_ACTIVE))
                 return 0;
 
@@ -855,7 +856,8 @@ static snd_pcm_uframes_t snd_via8233_pcm_pointer(struct snd_pcm_substream *subst
         unsigned int idx, count, res;
         int status;
         
-        snd_assert(viadev->tbl_entries, return 0);
+        if (snd_BUG_ON(!viadev->tbl_entries))
+                return 0;
 
         spin_lock(&chip->reg_lock);
         count = inl(VIADEV_REG(viadev, OFFSET_CURR_COUNT));
@@ -1037,7 +1039,7 @@ static int snd_via8233_playback_prepare(struct snd_pcm_substream *substream)
         else
                 rbits = (0x100000 / 48000) * runtime->rate +
                         ((0x100000 % 48000) * runtime->rate) / 48000;
-        snd_assert((rbits & ~0xfffff) == 0, return -EINVAL);
+        snd_BUG_ON(rbits & ~0xfffff);
         snd_via82xx_channel_reset(chip, viadev);
         snd_via82xx_set_table_ptr(chip, viadev);
         outb(chip->playback_volume[viadev->reg_offset / 0x10][0],
@@ -1144,9 +1146,9 @@ static struct snd_pcm_hardware snd_via82xx_hw =
         .rate_max =             48000,
         .channels_min =         1,
         .channels_max =         2,
-        .buffer_bytes_max =     128 * 1024,
+        .buffer_bytes_max =     VIA_MAX_BUFSIZE,
         .period_bytes_min =     32,
-        .period_bytes_max =     128 * 1024,
+        .period_bytes_max =     VIA_MAX_BUFSIZE / 2,
         .periods_min =          2,
         .periods_max =          VIA_TABLE_SIZE / 2,
         .fifo_size =            0,
@@ -1398,10 +1400,9 @@ static int __devinit snd_via8233_pcm_new(struct via82xx *chip)
         /* capture */
         init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1);
 
-        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                         snd_dma_pci_data(chip->pci),
-                                                         64*1024, 128*1024)) < 0)
-                return err;
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                              snd_dma_pci_data(chip->pci),
+                                              64*1024, VIA_MAX_BUFSIZE);
 
         /* PCM #1:  multi-channel playback and 2nd capture */
         err = snd_pcm_new(chip->card, chip->card->shortname, 1, 1, 1, &pcm);
@@ -1417,11 +1418,9 @@ static int __devinit snd_via8233_pcm_new(struct via82xx *chip)
         /* set up capture */
         init_viadev(chip, chip->capture_devno + 1, VIA_REG_CAPTURE_8233_STATUS + 0x10, 7, 1);
 
-        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                         snd_dma_pci_data(chip->pci),
-                                                         64*1024, 128*1024)) < 0)
-                return err;
-
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                              snd_dma_pci_data(chip->pci),
+                                              64*1024, VIA_MAX_BUFSIZE);
         return 0;
 }
 
@@ -1453,10 +1452,9 @@ static int __devinit snd_via8233a_pcm_new(struct via82xx *chip)
         /* capture */
         init_viadev(chip, chip->capture_devno, VIA_REG_CAPTURE_8233_STATUS, 6, 1);
 
-        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                         snd_dma_pci_data(chip->pci),
-                                                         64*1024, 128*1024)) < 0)
-                return err;
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                              snd_dma_pci_data(chip->pci),
+                                              64*1024, VIA_MAX_BUFSIZE);
 
         /* SPDIF supported? */
         if (! ac97_can_spdif(chip->ac97))
@@ -1473,11 +1471,9 @@ static int __devinit snd_via8233a_pcm_new(struct via82xx *chip)
         /* set up playback */
         init_viadev(chip, chip->playback_devno, 0x30, 3, 0);
 
-        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                         snd_dma_pci_data(chip->pci),
-                                                         64*1024, 128*1024)) < 0)
-                return err;
-
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                              snd_dma_pci_data(chip->pci),
+                                              64*1024, VIA_MAX_BUFSIZE);
         return 0;
 }
 
@@ -1505,11 +1501,9 @@ static int __devinit snd_via686_pcm_new(struct via82xx *chip)
         init_viadev(chip, 0, VIA_REG_PLAYBACK_STATUS, 0, 0);
         init_viadev(chip, 1, VIA_REG_CAPTURE_STATUS, 0, 1);
 
-        if ((err = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                                         snd_dma_pci_data(chip->pci),
-                                                         64*1024, 128*1024)) < 0)
-                return err;
-
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
+                                              snd_dma_pci_data(chip->pci),
+                                              64*1024, VIA_MAX_BUFSIZE);
         return 0;
 }