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

Conflicts:

	sound/core/memalloc.c

1 files changed, 14 insertions, 8 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]) {