Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	sound/core/memalloc.c

1 files changed, 4 insertions, 2 deletions

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 39ec55b57b1e..92f3a976ef2e 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -549,7 +549,8 @@ snd_ad1889_playback_pointer(struct snd_pcm_substream *ss)
         ptr = ad1889_readl(chip, AD_DMA_WAVCA);
         ptr -= chip->wave.addr;
         
-        snd_assert((ptr >= 0) && (ptr < chip->wave.size), return 0);
+        if (snd_BUG_ON(ptr >= chip->wave.size))
+                return 0;
         
         return bytes_to_frames(ss->runtime, ptr);
 }
@@ -567,7 +568,8 @@ snd_ad1889_capture_pointer(struct snd_pcm_substream *ss)
         ptr = ad1889_readl(chip, AD_DMA_ADCCA);
         ptr -= chip->ramc.addr;
 
-        snd_assert((ptr >= 0) && (ptr < chip->ramc.size), return 0);
+        if (snd_BUG_ON(ptr >= chip->ramc.size))
+                return 0;
         
         return bytes_to_frames(ss->runtime, ptr);
 }