2 files changed, 34 insertions, 25 deletions

diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index a69b4206c69e..c612b435ca2b 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -2931,7 +2931,8 @@ static int snd_trident_pcm_mixer_build(struct snd_trident *trident,
 {
         struct snd_trident_pcm_mixer *tmix;
 
-        snd_assert(trident != NULL && voice != NULL && substream != NULL, return -EINVAL);
+        if (snd_BUG_ON(!trident || !voice || !substream))
+                return -EINVAL;
         tmix = &trident->pcm_mixer[substream->number];
         tmix->voice = voice;
         tmix->vol = T4D_DEFAULT_PCM_VOL;
@@ -2946,7 +2947,8 @@ static int snd_trident_pcm_mixer_free(struct snd_trident *trident, struct snd_tr
 {
         struct snd_trident_pcm_mixer *tmix;
 
-        snd_assert(trident != NULL && substream != NULL, return -EINVAL);
+        if (snd_BUG_ON(!trident || !substream))
+                return -EINVAL;
         tmix = &trident->pcm_mixer[substream->number];
         tmix->voice = NULL;
         snd_trident_notify_pcm_change(trident, tmix, substream->number, 0);
@@ -3131,7 +3133,8 @@ static unsigned char snd_trident_gameport_read(struct gameport *gameport)
 {
         struct snd_trident *chip = gameport_get_port_data(gameport);
 
-        snd_assert(chip, return 0);
+        if (snd_BUG_ON(!chip))
+                return 0;
         return inb(TRID_REG(chip, GAMEPORT_LEGACY));
 }
 
@@ -3139,7 +3142,8 @@ static void snd_trident_gameport_trigger(struct gameport *gameport)
 {
         struct snd_trident *chip = gameport_get_port_data(gameport);
 
-        snd_assert(chip, return);
+        if (snd_BUG_ON(!chip))
+                return;
         outb(0xff, TRID_REG(chip, GAMEPORT_LEGACY));
 }
 
@@ -3148,7 +3152,8 @@ static int snd_trident_gameport_cooked_read(struct gameport *gameport, int *axes
         struct snd_trident *chip = gameport_get_port_data(gameport);
         int i;
 
-        snd_assert(chip, return 0);
+        if (snd_BUG_ON(!chip))
+                return 0;
 
         *buttons = (~inb(TRID_REG(chip, GAMEPORT_LEGACY)) >> 4) & 0xf;
 
@@ -3164,7 +3169,8 @@ static int snd_trident_gameport_open(struct gameport *gameport, int mode)
 {
         struct snd_trident *chip = gameport_get_port_data(gameport);
 
-        snd_assert(chip, return 0);
+        if (snd_BUG_ON(!chip))
+                return 0;
 
         switch (mode) {
                 case GAMEPORT_MODE_COOKED:
@@ -3891,8 +3897,8 @@ static void snd_trident_clear_voices(struct snd_trident * trident, unsigned shor
 {
         unsigned int i, val, mask[2] = { 0, 0 };
 
-        snd_assert(v_min <= 63, return);
-        snd_assert(v_max <= 63, return);
+        if (snd_BUG_ON(v_min > 63 || v_max > 63))
+                return;
         for (i = v_min; i <= v_max; i++)
                 mask[i >> 5] |= 1 << (i & 0x1f);
         if (mask[0]) {
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c
index 3fd7f1b29b0f..f9779e23fe57 100644
--- a/sound/pci/trident/trident_memory.c
+++ b/sound/pci/trident/trident_memory.c
@@ -194,11 +194,14 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,
         struct snd_util_memblk *blk;
         struct snd_pcm_runtime *runtime = substream->runtime;
         int idx, page;
-        struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
 
-        snd_assert(runtime->dma_bytes > 0 && runtime->dma_bytes <= SNDRV_TRIDENT_MAX_PAGES * SNDRV_TRIDENT_PAGE_SIZE, return NULL);
+        if (snd_BUG_ON(runtime->dma_bytes <= 0 ||
+                       runtime->dma_bytes > SNDRV_TRIDENT_MAX_PAGES *
+                                        SNDRV_TRIDENT_PAGE_SIZE))
+                return NULL;
         hdr = trident->tlb.memhdr;
-        snd_assert(hdr != NULL, return NULL);
+        if (snd_BUG_ON(!hdr))
+                return NULL;
 
         
 
@@ -208,18 +211,14 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,
                 mutex_unlock(&hdr->block_mutex);
                 return NULL;
         }
-        if (lastpg(blk) - firstpg(blk) >= sgbuf->pages) {
-                snd_printk(KERN_ERR "page calculation doesn't match: allocated pages = %d, trident = %d/%d\n", sgbuf->pages, firstpg(blk), lastpg(blk));
-                __snd_util_mem_free(hdr, blk);
-                mutex_unlock(&hdr->block_mutex);
-                return NULL;
-        }
                            
         /* set TLB entries */
         idx = 0;
         for (page = firstpg(blk); page <= lastpg(blk); page++, idx++) {
-                dma_addr_t addr = sgbuf->table[idx].addr;
-                unsigned long ptr = (unsigned long)sgbuf->table[idx].buf;
+                unsigned long ofs = idx << PAGE_SHIFT;
+                dma_addr_t addr = snd_pcm_sgbuf_get_addr(substream, ofs);
+                unsigned long ptr = (unsigned long)
+                        snd_pcm_sgbuf_get_ptr(substream, ofs);
                 if (! is_valid_page(addr)) {
                         __snd_util_mem_free(hdr, blk);
                         mutex_unlock(&hdr->block_mutex);
@@ -245,9 +244,13 @@ snd_trident_alloc_cont_pages(struct snd_trident *trident,
         dma_addr_t addr;
         unsigned long ptr;
 
-        snd_assert(runtime->dma_bytes> 0 && runtime->dma_bytes <= SNDRV_TRIDENT_MAX_PAGES * SNDRV_TRIDENT_PAGE_SIZE, return NULL);
+        if (snd_BUG_ON(runtime->dma_bytes <= 0 ||
+                       runtime->dma_bytes > SNDRV_TRIDENT_MAX_PAGES *
+                                        SNDRV_TRIDENT_PAGE_SIZE))
+                return NULL;
         hdr = trident->tlb.memhdr;
-        snd_assert(hdr != NULL, return NULL);
+        if (snd_BUG_ON(!hdr))
+                return NULL;
 
         mutex_lock(&hdr->block_mutex);
         blk = search_empty(hdr, runtime->dma_bytes);
@@ -279,8 +282,8 @@ struct snd_util_memblk *
 snd_trident_alloc_pages(struct snd_trident *trident,
                         struct snd_pcm_substream *substream)
 {
-        snd_assert(trident != NULL, return NULL);
-        snd_assert(substream != NULL, return NULL);
+        if (snd_BUG_ON(!trident || !substream))
+                return NULL;
         if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV_SG)
                 return snd_trident_alloc_sg_pages(trident, substream);
         else
@@ -297,8 +300,8 @@ int snd_trident_free_pages(struct snd_trident *trident,
         struct snd_util_memhdr *hdr;
         int page;
 
-        snd_assert(trident != NULL, return -EINVAL);
-        snd_assert(blk != NULL, return -EINVAL);
+        if (snd_BUG_ON(!trident || !blk))
+                return -EINVAL;
 
         hdr = trident->tlb.memhdr;
         mutex_lock(&hdr->block_mutex);